···131131132132#define SYMBOL_CONST 0x0001 /* symbol is const */133133#define SYMBOL_CHECK 0x0008 /* used during dependency checking */134134-#define SYMBOL_CHOICEVAL 0x0020 /* used as a value in a choice block */135134#define SYMBOL_VALID 0x0080 /* set when symbol.curr is calculated */136135#define SYMBOL_WRITE 0x0200 /* write symbol to file (KCONFIG_CONFIG) */137136#define SYMBOL_WRITTEN 0x0800 /* track info to avoid double-write to .config */
+1-1
scripts/kconfig/gconf.c
···10701070 row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);10711071 return row;10721072 }10731073- if (sym->flags & SYMBOL_CHOICEVAL)10731073+ if (sym_is_choice_value(sym))10741074 row[COL_BTNRAD] = GINT_TO_POINTER(TRUE);1075107510761076 stype = sym_get_type(sym);
+1-4
scripts/kconfig/lkc.h
···128128 return sym->name == NULL;129129}130130131131-static inline bool sym_is_choice_value(const struct symbol *sym)132132-{133133- return sym->flags & SYMBOL_CHOICEVAL ? true : false;134134-}131131+bool sym_is_choice_value(const struct symbol *sym);135132136133static inline bool sym_has_value(const struct symbol *sym)137134{
-5
scripts/kconfig/menu.c
···467467 sym->dir_dep.expr = expr_alloc_or(sym->dir_dep.expr, parent->dep);468468 }469469 for (menu = parent->list; menu; menu = menu->next) {470470- if (sym && sym_is_choice(sym) &&471471- menu->sym && !sym_is_choice_value(menu->sym)) {472472- menu->sym->flags |= SYMBOL_CHOICEVAL;473473- }474474-475470 /*476471 * This code serves two purposes:477472 *