6 files changed, 206 insertions, 223 deletions

diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index bed0f4e2d2f7..6a61cee4a32c 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -5,25 +5,6 @@
 
 /* A lexical scanner generated by flex */
 
-#define yy_create_buffer zconf_create_buffer
-#define yy_delete_buffer zconf_delete_buffer
-#define yy_flex_debug zconf_flex_debug
-#define yy_init_buffer zconf_init_buffer
-#define yy_flush_buffer zconf_flush_buffer
-#define yy_load_buffer_state zconf_load_buffer_state
-#define yy_switch_to_buffer zconf_switch_to_buffer
-#define yyin zconfin
-#define yyleng zconfleng
-#define yylex zconflex
-#define yylineno zconflineno
-#define yyout zconfout
-#define yyrestart zconfrestart
-#define yytext zconftext
-#define yywrap zconfwrap
-#define yyalloc zconfalloc
-#define yyrealloc zconfrealloc
-#define yyfree zconffree
-
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
@@ -354,7 +335,7 @@ void zconffree (void *  );
 
 /* Begin user sect3 */
 
-#define zconfwrap(n) 1
+#define zconfwrap() 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -1535,7 +1516,7 @@ static int yy_get_next_buffer (void)
 
                 /* Read in more data. */
                 YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-                        (yy_n_chars), num_to_read );
+                        (yy_n_chars), (size_t) num_to_read );
 
                 YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
                 }
@@ -2007,7 +1988,7 @@ YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
 
 /** Setup the input buffer state to scan a string. The next call to zconflex() will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 4d09f6ddefe3..8e69461313d1 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -21,7 +21,7 @@ P(menu_get_help,const char *,(struct menu *menu));
 /* symbol.c */
 P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
 
-P(sym_lookup,struct symbol *,(const char *name, int isconst));
+P(sym_lookup,struct symbol *,(const char *name, int flags));
 P(sym_find,struct symbol *,(const char *name));
 P(sym_re_search,struct symbol **,(const char *pattern));
 P(sym_type_name,const char *,(enum symbol_type type));
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 606ceb9e746e..07ff8d105c9d 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -235,18 +235,22 @@ void menu_finalize(struct menu *parent)
         sym = parent->sym;
         if (parent->list) {
                 if (sym && sym_is_choice(sym)) {
-                        /* find the first choice value and find out choice type */
-                        for (menu = parent->list; menu; menu = menu->next) {
-                                if (menu->sym) {
-                                        current_entry = parent;
-                                        if (sym->type == S_UNKNOWN)
+                        if (sym->type == S_UNKNOWN) {
+                                /* find the first choice value to find out choice type */
+                                current_entry = parent;
+                                for (menu = parent->list; menu; menu = menu->next) {
+                                        if (menu->sym && menu->sym->type != S_UNKNOWN) {
                                                 menu_set_type(menu->sym->type);
-                                        current_entry = menu;
-                                        if (menu->sym->type == S_UNKNOWN)
-                                                menu_set_type(sym->type);
-                                        break;
+                                                break;
+                                        }
                                 }
                         }
+                        /* set the type of the remaining choice values */
+                        for (menu = parent->list; menu; menu = menu->next) {
+                                current_entry = menu;
+                                if (menu->sym && menu->sym->type == S_UNKNOWN)
+                                        menu_set_type(sym->type);
+                        }
                         parentdep = expr_alloc_symbol(sym);
                 } else if (parent->prompt)
                         parentdep = parent->prompt->visible.expr;
@@ -313,50 +317,36 @@ void menu_finalize(struct menu *parent)
                 }
         }
         for (menu = parent->list; menu; menu = menu->next) {
-                if (sym && sym_is_choice(sym) && menu->sym) {
+                if (sym && sym_is_choice(sym) &&
+                    menu->sym && !sym_is_choice_value(menu->sym)) {
+                        current_entry = menu;
                         menu->sym->flags |= SYMBOL_CHOICEVAL;
                         if (!menu->prompt)
                                 menu_warn(menu, "choice value must have a prompt");
                         for (prop = menu->sym->prop; prop; prop = prop->next) {
-                                if (prop->type == P_PROMPT && prop->menu != menu) {
-                                        prop_warn(prop, "choice values "
-                                            "currently only support a "
-                                            "single prompt");
-                                }
                                 if (prop->type == P_DEFAULT)
                                         prop_warn(prop, "defaults for choice "
-                                            "values not supported");
+                                                  "values not supported");
+                                if (prop->menu == menu)
+                                        continue;
+                                if (prop->type == P_PROMPT &&
+                                    prop->menu->parent->sym != sym)
+                                        prop_warn(prop, "choice value used outside its choice group");
                         }
-                        current_entry = menu;
-                        if (menu->sym->type == S_UNKNOWN)
-                                menu_set_type(sym->type);
                         /* Non-tristate choice values of tristate choices must
                          * depend on the choice being set to Y. The choice
                          * values' dependencies were propagated to their
                          * properties above, so the change here must be re-
-                         * propagated. */
+                         * propagated.
+                         */
                         if (sym->type == S_TRISTATE && menu->sym->type != S_TRISTATE) {
                                 basedep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes);
-                                basedep = expr_alloc_and(basedep, menu->dep);
-                                basedep = expr_eliminate_dups(basedep);
-                                menu->dep = basedep;
+                                menu->dep = expr_alloc_and(basedep, menu->dep);
                                 for (prop = menu->sym->prop; prop; prop = prop->next) {
                                         if (prop->menu != menu)
                                                 continue;
-                                        dep = expr_alloc_and(expr_copy(basedep),
-                                                             prop->visible.expr);
-                                        dep = expr_eliminate_dups(dep);
-                                        dep = expr_trans_bool(dep);
-                                        prop->visible.expr = dep;
+                                        prop->visible.expr = expr_alloc_and(expr_copy(basedep),
+                                                                            prop->visible.expr);