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.

Masahiro Yamada committed 5 years ago

Commit 6dd85ff1 parent ab838579 files · +13 −27Browse files

Showing the changes to scripts (7 of 9 files). Show all

Unified · Split

7 files

@@ -112,7 +112,6 @@ n [A-Za-z0-9_-] · 111 unmodified lines
112	"menuconfig" return T_MENUCONFIG;	112	"menuconfig" return T_MENUCONFIG;
113	"modules" return T_MODULES;	113	"modules" return T_MODULES;
114	"on" return T_ON;	114	"on" return T_ON;
115	"option" return T_OPTION;
116	"optional" return T_OPTIONAL;	115	"optional" return T_OPTIONAL;
117	"prompt" return T_PROMPT;	116	"prompt" return T_PROMPT;
118	"range" return T_RANGE;	117	"range" return T_RANGE;

@@ -95,7 +95,6 @@ void menu_add_visibility(struct expr *dep); · 94 unmodified lines
95	struct property menu_add_prompt(enum prop_type type, char prompt, struct expr *dep);	95	struct property menu_add_prompt(enum prop_type type, char prompt, struct expr *dep);
96	void menu_add_expr(enum prop_type type, struct expr expr, struct expr dep);	96	void menu_add_expr(enum prop_type type, struct expr expr, struct expr dep);
97	void menu_add_symbol(enum prop_type type, struct symbol sym, struct expr dep);	97	void menu_add_symbol(enum prop_type type, struct symbol sym, struct expr dep);
98	void menu_add_option_modules(void);
99	void menu_finalize(struct menu *parent);	98	void menu_finalize(struct menu *parent);
100	void menu_set_type(int type);	99	void menu_set_type(int type);
101		100

@@ -211,14 +211,6 @@ void menu_add_symbol(enum prop_type type, struct symbol sym, struct expr dep) · 210 unmodified lines
211	menu_add_prop(type, expr_alloc_symbol(sym), dep);	211	menu_add_prop(type, expr_alloc_symbol(sym), dep);
212	}	212	}
213		213
214	void menu_add_option_modules(void)
215	{
216	if (modules_sym)
217	zconf_error("symbol '%s' redefines option 'modules' already defined by symbol '%s'",
218	current_entry->sym->name, modules_sym->name);
219	modules_sym = current_entry->sym;
220	}
221
222	static int menu_validate_number(struct symbol sym, struct symbol sym2)	214	static int menu_validate_number(struct symbol sym, struct symbol sym2)
223	{	215	{
224	return sym2->type == S_INT \|\| sym2->type == S_HEX \|\|	216	return sym2->type == S_INT \|\| sym2->type == S_HEX \|\|

 %token T_MODULES
 %token T_ON
 %token T_OPEN_PAREN
-%token T_OPTION
 %token T_OPTIONAL
 %token T_PLUS_EQUAL
 %token T_PROMPT
 	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
 };
-config_option: T_OPTION T_MODULES T_EOL
+config_option: T_MODULES T_EOL
 {
-	menu_add_option_modules();
+	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;
 };
 /* choice entry */

@@ -2,7 +2,7 @@ · 1 unmodified line
2		2
3	config MODULES	3	config MODULES
4	bool "Enable loadable module support"	4	bool "Enable loadable module support"
5	option modules	5	modules
6	default y	6	default y
7		7
8	choice	8	choice

Keyboard shortcuts