Commit 6dd85ff1 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: change "modules" from sub-option to first-level attribute 



Now "modules" is the only member of the "option" property.

Remove "option", and move "modules" to the top level property.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent ab838577

Documentation/kbuild/kconfig-language.rst

+4 −10
Original line number Diff line number Diff line
@@ -223,13 +223,7 @@ applicable everywhere (see syntax). 
  the indentation level, this means it ends at the first line which has

  a smaller indentation than the first line of the help text.



- misc options: "option" <symbol>[=<value>]



  Various less common options can be defined via this option syntax,

  which can modify the behaviour of the menu entry and its config

  symbol. These options are currently possible:



  - "modules"

- module attribute: "modules"

  This declares the symbol to be used as the MODULES symbol, which

  enables the third modular state for all config symbols.

  At most one symbol may have the "modules" option set.

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2042,7 +2042,7 @@ config MODULE_SIG_FORMAT 


menuconfig MODULES

	bool "Enable loadable module support"

	option modules

	modules

	help

	  Kernel modules are small pieces of compiled code which can

	  be inserted in the running kernel, rather than being

scripts/kconfig/lexer.l

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ n [A-Za-z0-9_-] 
"menuconfig"		return T_MENUCONFIG;

"modules"		return T_MODULES;

"on"			return T_ON;

"option"		return T_OPTION;

"optional"		return T_OPTIONAL;

"prompt"		return T_PROMPT;

"range"			return T_RANGE;

scripts/kconfig/lkc.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ void menu_add_visibility(struct expr *dep); 
struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);

void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);

void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);

void menu_add_option_modules(void);

void menu_finalize(struct menu *parent);

void menu_set_type(int type);

scripts/kconfig/menu.c

+0 −8
Original line number Diff line number Diff line
@@ -211,14 +211,6 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep) 
	menu_add_prop(type, expr_alloc_symbol(sym), dep);

}



void menu_add_option_modules(void)

{

	if (modules_sym)

		zconf_error("symbol '%s' redefines option 'modules' already defined by symbol '%s'",

			    current_entry->sym->name, modules_sym->name);

	modules_sym = current_entry->sym;

}



static int menu_validate_number(struct symbol *sym, struct symbol *sym2)

{

	return sym2->type == S_INT || sym2->type == S_HEX ||