diff options
-rw-r--r-- | scripts/kconfig/menu.c | 5 | ||||
-rw-r--r-- | scripts/kconfig/zconf.y | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 7e233a6ca64e..3a9c67493260 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -197,12 +197,9 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep) | |||
197 | 197 | ||
198 | void menu_add_option(int token, char *arg) | 198 | void menu_add_option(int token, char *arg) |
199 | { | 199 | { |
200 | struct property *prop; | ||
201 | |||
202 | switch (token) { | 200 | switch (token) { |
203 | case T_OPT_MODULES: | 201 | case T_OPT_MODULES: |
204 | prop = prop_alloc(P_DEFAULT, modules_sym); | 202 | modules_sym = current_entry->sym; |
205 | prop->expr = expr_alloc_symbol(current_entry->sym); | ||
206 | break; | 203 | break; |
207 | case T_OPT_DEFCONFIG_LIST: | 204 | case T_OPT_DEFCONFIG_LIST: |
208 | if (!sym_defconfig_list) | 205 | if (!sym_defconfig_list) |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 864da07ba4aa..0653886fac48 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -493,9 +493,6 @@ void conf_parse(const char *name) | |||
493 | 493 | ||
494 | sym_init(); | 494 | sym_init(); |
495 | _menu_init(); | 495 | _menu_init(); |
496 | modules_sym = sym_lookup(NULL, 0); | ||
497 | modules_sym->type = S_BOOLEAN; | ||
498 | modules_sym->flags |= SYMBOL_AUTO; | ||
499 | rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); | 496 | rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); |
500 | 497 | ||
501 | if (getenv("ZCONF_DEBUG")) | 498 | if (getenv("ZCONF_DEBUG")) |
@@ -503,12 +500,8 @@ void conf_parse(const char *name) | |||
503 | zconfparse(); | 500 | zconfparse(); |
504 | if (zconfnerrs) | 501 | if (zconfnerrs) |
505 | exit(1); | 502 | exit(1); |
506 | if (!modules_sym->prop) { | 503 | if (!modules_sym) |
507 | struct property *prop; | 504 | modules_sym = sym_find( "n" ); |
508 | |||
509 | prop = prop_alloc(P_DEFAULT, modules_sym); | ||
510 | prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); | ||
511 | } | ||
512 | 505 | ||
513 | rootmenu.prompt->text = _(rootmenu.prompt->text); | 506 | rootmenu.prompt->text = _(rootmenu.prompt->text); |
514 | rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); | 507 | rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); |