History

kconfig: do not special-case 'MODULES' symbol

Currently, the 'MODULES' symbol is hard-coded to be the default symbol that enables/disables tristates, if no other symbol was declared with 'option modules'. While this used to be needed for the Linux kernel, we now have an explicit 'option modules' attached to the 'MODULES' symbol (since cset 11097a036), so we no longer need to special-case it in the kconfig code. Furthermore, kconfig is extensively used out of the Linux kernel, and other projects may have another meaning for a symbol named 'MODULES'. This patch changes the way we enable/disable tristates: if a symbol was found with 'option modules' attached to it, then that symbol controls enabling tristates. Otherwise, tristates are disabled, even if a symbol named 'MODULES' exists.

Yann E. MORIN committed 13 years ago

Commit 6902dcc1 parent c8272fa2 files · +3 −13Browse files

Unified · Split

2 files
  1. scripts/kconfig/menu.c +1 −4
  2. scripts/kconfig/zconf.y +2 −9
scripts/kconfig/menu.c+1−4
@@ -197,12 +197,9 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep) · 196 unmodified lines
197 197
198void menu_add_option(int token, char *arg)198void 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)
scripts/kconfig/zconf.y+2−9
@@ -493,9 +493,6 @@ void conf_parse(const char *name) · 492 unmodified lines
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) · 1 unmodified line
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);