1 files changed, 4 insertions, 3 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 2e35d4b2bbfd..89274809a826 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -288,8 +288,6 @@ 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:
@@ -379,13 +377,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);
@@ -791,6 +789,8 @@ 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);
@@ -1077,6 +1077,7 @@ 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 */