lkml.org 
[lkml]   [2018]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/27] kconfig: loosen the order of "visible" and "depends on" in menu entry
    Date
    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>
    ---

    scripts/kconfig/zconf.y | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
    index eeb449b..7cc8244 100644
    --- a/scripts/kconfig/zconf.y
    +++ b/scripts/kconfig/zconf.y
    @@ -341,7 +341,7 @@ menu: T_MENU prompt T_EOL
    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();
    };
    @@ -357,6 +357,12 @@ menu_end: 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
    {
    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_list:
    - /* empty */
    - | visibility_list visible
    -;
    -
    visible: T_VISIBLE if_expr T_EOL
    {
    menu_add_visibility($2);
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-12-11 12:03    [W:3.223 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site