Update LinuxKernelConf to 1.3, latest available.

1 files changed, 23 insertions, 12 deletions

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 59c88d2..845d8a3 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -150,5 +150,5 @@ void sym_calc_visibility(struct symbol *sym)
 	if (oldvisible != visible) {
 		sym->visible = visible;
-		sym->flags |= SYMBOL_CHANGED;
+		sym_set_changed(sym);
 	}
 }
@@ -205,5 +205,6 @@ void sym_calc_value(struct symbol *sym)
 					newval = prop->def->curr;
 				}
-			}
+			} else
+				S_TRI(newval) = S_TRI(sym->def);
 		} else
 			newval = sym->def;
@@ -277,5 +278,5 @@ out:
 
 	if (memcmp(&oldval, &newval, sizeof(newval)))
-		sym->flags |= SYMBOL_CHANGED;
+		sym_set_changed(sym);
 	sym->curr = newval;
 
@@ -283,6 +284,9 @@ out:
 		int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE);
 		prop = sym_get_choice_prop(sym);
-		for (e = prop->dep; e; e = e->left.expr)
+		for (e = prop->dep; e; e = e->left.expr) {
 			e->right.sym->flags |= flags;
+			if (flags & SYMBOL_CHANGED)
+				sym_set_changed(e->right.sym);
+		}
 	}
 }
@@ -298,4 +302,15 @@ void sym_clear_all_valid(void)
 }
 
+void sym_set_changed(struct symbol *sym)
+{
+	struct property *prop;
+
+	sym->flags |= SYMBOL_CHANGED;
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu)
+			prop->menu->flags |= MENU_CHANGED;
+	}
+}
+
 void sym_set_all_changed(void)
 {
@@ -304,5 +319,5 @@ void sym_set_all_changed(void)
 
 	for_all_symbols(i, sym)
-		sym->flags |= SYMBOL_CHANGED;
+		sym_set_changed(sym);
 }
 
@@ -341,5 +356,5 @@ bool sym_set_tristate_value(struct symbol *sym, tristate val)
 	if (sym->flags & SYMBOL_NEW) {
 		sym->flags &= ~SYMBOL_NEW;
-		sym->flags |= SYMBOL_CHANGED;
+		sym_set_changed(sym);
 	}
 	if (sym_is_choice_value(sym) && val == yes) {
@@ -461,5 +476,5 @@ bool sym_set_string_value(struct symbol *sym, const char *newval)
 	if (sym->flags & SYMBOL_NEW) {
 		sym->flags &= ~SYMBOL_NEW;
-		sym->flags |= SYMBOL_CHANGED;
+		sym_set_changed(sym);
 	}
 
@@ -526,5 +541,4 @@ struct symbol *sym_lookup(const char *name, int isconst)
 	int hash = 0;
 
-	//printf("lookup: %s -> ", name);
 	if (name) {
 		if (name[0] && !name[1]) {
@@ -542,8 +556,6 @@ struct symbol *sym_lookup(const char *name, int isconst)
 			if (!strcmp(symbol->name, name)) {
 				if ((isconst && symbol->flags & SYMBOL_CONST) ||
-				    (!isconst && !(symbol->flags & SYMBOL_CONST))) {
-					//printf("h:%p\n", symbol);
+				    (!isconst && !(symbol->flags & SYMBOL_CONST)))
 					return symbol;
-				}
 			}
 		}
@@ -565,5 +577,4 @@ struct symbol *sym_lookup(const char *name, int isconst)
 	symbol_hash[hash] = symbol;
 
-	//printf("n:%p\n", symbol);
 	return symbol;
 }