p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kconfig: loosen the order of "visible" and "depends on" in menu entry 

Currently, "visible" and "depends on", if defined in a menu entry,
must appear in that order.

The real example is in drivers/media/tuners/Kconfig:

  menu "Customize TV tuners"
          visible if <expr1>
          depends on <expr2>

... is fine, but you cannot change the property order like this:

  menu "Customize TV tuners"
          depends on <expr2>
          visible if <expr1>

Kconfig does not require a specific order of properties. In this case,
menu_add_visibility(() and menu_add_dep() are orthogonal.

Loosen this unreasonable restriction.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2018-12-11 20:00:56 +09:00
parent 94d4e1b602
commit 1f31be9ec0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/kconfig/zconf.y
View File

@ -341,7 +341,7 @@ menu: T_MENU prompt T_EOL
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
}; };
menu_entry: menu visibility_list depends_list menu_entry: menu menu_option_list
{ {
$$ = menu_add_menu(); $$ = menu_add_menu();
}; };
@ -357,6 +357,12 @@ menu_end: end
menu_stmt: menu_entry stmt_list menu_end menu_stmt: menu_entry stmt_list menu_end
; ;
menu_option_list:
/* empty */
| menu_option_list visible
| menu_option_list depends
;
source_stmt: T_SOURCE prompt T_EOL source_stmt: T_SOURCE prompt T_EOL
{ {
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2); printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
@ -414,12 +420,6 @@ depends: T_DEPENDS T_ON expr T_EOL
}; };
/* visibility option */ /* visibility option */
visibility_list:
/* empty */
| visibility_list visible
;
visible: T_VISIBLE if_expr T_EOL visible: T_VISIBLE if_expr T_EOL
{ {
menu_add_visibility($2); menu_add_visibility($2);