kconfig: Fix defconfig when one choice menu selects options that another choice menu...

[carl9170fw.git] / config / confdata.c

diff --git a/config/confdata.c b/config/confdata.c
index 7976da1ce84e15ed28ad686b7fe85ba42c3c9558..bd7a229f15ab26f9008fa83b14bb51346eaa17f0 100644 (file)
--- a/config/confdata.c
+++ b/config/confdata.c
@@ -288,6 +288,8 @@ load:
        for_all_symbols(i, sym) {
                sym->flags |= SYMBOL_CHANGED;
                sym->flags &= ~(def_flags|SYMBOL_VALID);
+               if (sym_is_choice(sym))
+                       sym->flags |= def_flags;
                switch (sym->type) {
                case S_INT:
                case S_HEX:
@@ -377,13 +379,13 @@ setsym:
                        case mod:
                                if (cs->def[def].tri == yes) {
                                        conf_warning("%s creates inconsistent choice state", sym->name);
+                                       cs->flags &= ~def_flags;
                                }
                                break;
                        case yes:
                                if (cs->def[def].tri != no)
                                        conf_warning("override: %s changes choice state", sym->name);
                                cs->def[def].val = sym;
-                               cs->flags |= def_flags;
                                break;
                        }
                        cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
@@ -835,8 +837,6 @@ int conf_write(const char *name)
                        sym_calc_value(sym);
                        if (!(sym->flags & SYMBOL_WRITE))
                                goto next;
-                       if (sym_is_choice_value(sym) && !menu_is_visible(menu->parent))
-                               goto next;
                        sym->flags &= ~SYMBOL_WRITE;
 
                        conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
@@ -1140,14 +1140,13 @@ static void randomize_choice_values(struct symbol *csym)
                else {
                        sym->def[S_DEF_USER].tri = no;
                }
-               sym->flags &= ~(SYMBOL_VALID);
        }
        csym->flags |= SYMBOL_DEF_USER;
        /* clear VALID to get value calculated */
        csym->flags &= ~(SYMBOL_VALID);
 }
 
-static void set_all_choice_values(struct symbol *csym)
+void set_all_choice_values(struct symbol *csym)
 {
        struct property *prop;
        struct symbol *sym;
@@ -1164,7 +1163,7 @@ static void set_all_choice_values(struct symbol *csym)
        }
        csym->flags |= SYMBOL_DEF_USER;
        /* clear VALID to get value calculated */
-       csym->flags &= ~(SYMBOL_VALID);
+       csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);
 }
 
 void conf_set_all_new_symbols(enum conf_def_mode mode)
@@ -1266,6 +1265,14 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
         * selected in a choice block and we set it to yes,
         * and the rest to no.
         */
+       if (mode != def_random) {
+               for_all_symbols(i, csym) {
+                       if ((sym_is_choice(csym) && !sym_has_value(csym)) ||
+                           sym_is_choice_value(csym))
+                               csym->flags |= SYMBOL_NEED_SET_CHOICE_VALUES;
+               }
+       }
+
        for_all_symbols(i, csym) {
                if (sym_has_value(csym) || !sym_is_choice(csym))
                        continue;
@@ -1273,7 +1280,5 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                sym_calc_value(csym);
                if (mode == def_random)
                        randomize_choice_values(csym);
-               else
-                       set_all_choice_values(csym);
        }
 }