diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2010-08-16 22:55:31 -0400 |
---|---|---|
committer | Arnaud Lacombe <lacombar@gmail.com> | 2010-09-19 18:19:39 -0400 |
commit | 8ea13e2c87c83b7cb0b360cb8779415967727647 (patch) | |
tree | a9027fe04302487191b3469fd07243ffe6c721c9 /scripts/kconfig | |
parent | ef211607ed49c475735898514c60a9797208b699 (diff) |
kconfig: implement the `mainmenu' directive
If specified, the directive must be placed at the top of the Kconfig file.
We need to change the grammar to make the mainmenu directive set the
`rootmenu' prompt. This reflect how menu_add_prompt() works internally, ie.
set the prompt of the `current_entry', pointing originally to `rootmenu'.
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r-- | scripts/kconfig/zconf.y | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 23dfd3baa7a1..e9b14efd7414 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -36,7 +36,7 @@ static struct menu *current_menu, *current_entry; | |||
36 | #define YYERROR_VERBOSE | 36 | #define YYERROR_VERBOSE |
37 | #endif | 37 | #endif |
38 | %} | 38 | %} |
39 | %expect 26 | 39 | %expect 28 |
40 | 40 | ||
41 | %union | 41 | %union |
42 | { | 42 | { |
@@ -104,14 +104,15 @@ static struct menu *current_menu, *current_entry; | |||
104 | %} | 104 | %} |
105 | 105 | ||
106 | %% | 106 | %% |
107 | input: stmt_list; | 107 | input: nl start | start; |
108 | |||
109 | start: mainmenu_stmt stmt_list | stmt_list; | ||
108 | 110 | ||
109 | stmt_list: | 111 | stmt_list: |
110 | /* empty */ | 112 | /* empty */ |
111 | | stmt_list common_stmt | 113 | | stmt_list common_stmt |
112 | | stmt_list choice_stmt | 114 | | stmt_list choice_stmt |
113 | | stmt_list menu_stmt | 115 | | stmt_list menu_stmt |
114 | | stmt_list T_MAINMENU prompt nl | ||
115 | | stmt_list end { zconf_error("unexpected end statement"); } | 116 | | stmt_list end { zconf_error("unexpected end statement"); } |
116 | | stmt_list T_WORD error T_EOL { zconf_error("unknown statement \"%s\"", $2); } | 117 | | stmt_list T_WORD error T_EOL { zconf_error("unknown statement \"%s\"", $2); } |
117 | | stmt_list option_name error T_EOL | 118 | | stmt_list option_name error T_EOL |
@@ -342,6 +343,13 @@ if_block: | |||
342 | | if_block choice_stmt | 343 | | if_block choice_stmt |
343 | ; | 344 | ; |
344 | 345 | ||
346 | /* mainmenu entry */ | ||
347 | |||
348 | mainmenu_stmt: T_MAINMENU prompt nl | ||
349 | { | ||
350 | menu_add_prompt(P_MENU, $2, NULL); | ||
351 | }; | ||
352 | |||
345 | /* menu entry */ | 353 | /* menu entry */ |
346 | 354 | ||
347 | menu: T_MENU prompt T_EOL | 355 | menu: T_MENU prompt T_EOL |