From ce40ccddb1c9edb9dbcba5db2e18a4cd0d94a0de Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 26 Apr 2013 22:41:32 +0200 Subject: [PATCH] --- yaml --- r: 373703 b: refs/heads/master c: 23a5dfdad22a574d19d7cc19b391f9ce0d3c2f21 h: refs/heads/master i: 373701: b3e121a2191a64fcc5cf460959f2660086ec7807 373699: 778ffbcc651f93300bdc4be0b2db842ab1931878 373695: a250d99bde4fab95bb01f0d084cf4a29ada24406 v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/confdata.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c7f1088cd148..ee43299f61df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e43956e607692f9b1c710311e4a6591ffba1edf0 +refs/heads/master: 23a5dfdad22a574d19d7cc19b391f9ce0d3c2f21 diff --git a/trunk/scripts/kconfig/confdata.c b/trunk/scripts/kconfig/confdata.c index fc45fc137875..43eda40c3838 100644 --- a/trunk/scripts/kconfig/confdata.c +++ b/trunk/scripts/kconfig/confdata.c @@ -288,6 +288,8 @@ int conf_read_simple(const char *name, int def) 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 @@ int conf_read_simple(const char *name, int def) 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); @@ -789,8 +791,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); @@ -1077,7 +1077,6 @@ 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 */