diff options
| author | Alper Yildirim | 2009-07-20 18:50:58 +0200 |
|---|---|---|
| committer | Thomas Petazzoni | 2009-07-27 16:06:50 +0200 |
| commit | 4b3e11b3e7d00881878f45cddbfe8f4bf07d1ebe (patch) | |
| tree | 3740632b5196497242055f7ecdfe4be3c6210409 /package/config/zconf.y | |
| parent | ruby: needs WCHAR support in toolchain (diff) | |
| download | buildroot-4b3e11b3e7d00881878f45cddbfe8f4bf07d1ebe.tar.gz buildroot-4b3e11b3e7d00881878f45cddbfe8f4bf07d1ebe.tar.xz buildroot-4b3e11b3e7d00881878f45cddbfe8f4bf07d1ebe.zip | |
config: Update package/config to Kconfig 2.6.30
Update the package/config stuff with the code available in the Linux
kernel 2.6.30.
Signed-off-by: Alper Yildirim <ayildirim@aselsan.com>
Diffstat (limited to 'package/config/zconf.y')
| -rw-r--r-- | package/config/zconf.y | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/package/config/zconf.y b/package/config/zconf.y index 34c907b49..62eee9cb8 100644 --- a/package/config/zconf.y +++ b/package/config/zconf.y @@ -91,7 +91,7 @@ static struct menu *current_menu, *current_entry; %type <id> end %type <id> option_name %type <menu> if_entry menu_entry choice_entry -%type <string> symbol_option_arg +%type <string> symbol_option_arg word_opt %destructor { fprintf(stderr, "%s:%d: missing end statement for this entry\n", @@ -239,10 +239,10 @@ symbol_option_arg: /* choice entry */ -choice: T_CHOICE T_EOL +choice: T_CHOICE word_opt T_EOL { - struct symbol *sym = sym_lookup(NULL, 0); - sym->flags |= SYMBOL_CHOICE; + struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE); + sym->flags |= SYMBOL_AUTO; menu_add_entry(sym); menu_add_expr(P_CHOICE, NULL, NULL); printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno()); @@ -456,9 +456,12 @@ expr: symbol { $$ = expr_alloc_symbol($1); } ; symbol: T_WORD { $$ = sym_lookup($1, 0); free($1); } - | T_WORD_QUOTE { $$ = sym_lookup($1, 1); free($1); } + | T_WORD_QUOTE { $$ = sym_lookup($1, SYMBOL_CONST); free($1); } ; +word_opt: /* empty */ { $$ = NULL; } + | T_WORD + %% void conf_parse(const char *name) |