diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2021-03-13 22:48:36 +0300 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2021-04-14 09:22:49 +0300 |
| commit | 6dd85ff178cd76851e2184b13e545f5a88d1be30 (patch) | |
| tree | a7743b360faf3a71d624d76a9564efeb1142da9d /scripts/kconfig/parser.y | |
| parent | ab838577aaaeda12242b7f1e2da3f25c9b4cec3a (diff) | |
| download | linux-6dd85ff178cd76851e2184b13e545f5a88d1be30.tar.xz | |
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: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts/kconfig/parser.y')
| -rw-r--r-- | scripts/kconfig/parser.y | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y index 2ada169c8b5d..e46ce21a2fc4 100644 --- a/scripts/kconfig/parser.y +++ b/scripts/kconfig/parser.y @@ -69,7 +69,6 @@ static struct menu *current_menu, *current_entry; %token T_MODULES %token T_ON %token T_OPEN_PAREN -%token T_OPTION %token T_OPTIONAL %token T_PLUS_EQUAL %token T_PROMPT @@ -216,9 +215,12 @@ config_option: T_RANGE symbol symbol if_expr T_EOL 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 */ |