From 497b40c3019458ca7b83329b1796a181f8175659 Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Mon, 14 Jan 2008 04:51:16 +0100 Subject: [PATCH] --- yaml --- r: 77984 b: refs/heads/master c: 80daa56008dad44f08d0b47670cf2513aa98ab53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/init/Kconfig | 8 ++++++++ trunk/scripts/kconfig/symbol.c | 15 --------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 5ffc4be53263..487f0c64a32d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93449082e905ce73d0346d617dd67c4b668b58af +refs/heads/master: 80daa56008dad44f08d0b47670cf2513aa98ab53 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 288444b4cd8a..0d0bbf218f1f 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -1,3 +1,11 @@ +config ARCH + string + option env="ARCH" + +config KERNELVERSION + string + option env="KERNELVERSION" + config DEFCONFIG_LIST string depends on !UML diff --git a/trunk/scripts/kconfig/symbol.c b/trunk/scripts/kconfig/symbol.c index 99e3d02d1cfc..3929e5b35e79 100644 --- a/trunk/scripts/kconfig/symbol.c +++ b/trunk/scripts/kconfig/symbol.c @@ -47,7 +47,6 @@ void sym_init(void) { struct symbol *sym; struct utsname uts; - char *p; static bool inited = false; if (inited) @@ -56,20 +55,6 @@ void sym_init(void) uname(&uts); - sym = sym_lookup("ARCH", 0); - sym->type = S_STRING; - sym->flags |= SYMBOL_AUTO; - p = getenv("ARCH"); - if (p) - sym_add_default(sym, p); - - sym = sym_lookup("KERNELVERSION", 0); - sym->type = S_STRING; - sym->flags |= SYMBOL_AUTO; - p = getenv("KERNELVERSION"); - if (p) - sym_add_default(sym, p); - sym = sym_lookup("UNAME_RELEASE", 0); sym->type = S_STRING; sym->flags |= SYMBOL_AUTO;