diff options
Diffstat (limited to 'scripts/kconfig')
-rw-r--r-- | scripts/kconfig/menu.c | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 7bfa181d6ed6..f9d0d91a3fe4 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -235,23 +235,16 @@ void menu_finalize(struct menu *parent) | |||
235 | sym = parent->sym; | 235 | sym = parent->sym; |
236 | if (parent->list) { | 236 | if (parent->list) { |
237 | if (sym && sym_is_choice(sym)) { | 237 | if (sym && sym_is_choice(sym)) { |
238 | /* find out choice type */ | 238 | /* find the first choice value and find out choice type */ |
239 | enum symbol_type type = S_UNKNOWN; | ||
240 | |||
241 | for (menu = parent->list; menu; menu = menu->next) { | 239 | for (menu = parent->list; menu; menu = menu->next) { |
242 | if (menu->sym && menu->sym->type != S_UNKNOWN) { | 240 | if (menu->sym) { |
243 | if (type == S_UNKNOWN) | 241 | current_entry = parent; |
244 | type = menu->sym->type; | 242 | menu_set_type(menu->sym->type); |
245 | if (type != S_BOOLEAN) | 243 | current_entry = menu; |
246 | break; | 244 | menu_set_type(sym->type); |
247 | if (menu->sym->type == S_TRISTATE) { | 245 | break; |
248 | type = S_TRISTATE; | ||
249 | break; | ||
250 | } | ||
251 | } | 246 | } |
252 | } | 247 | } |
253 | current_entry = parent; | ||
254 | menu_set_type(type); | ||
255 | parentdep = expr_alloc_symbol(sym); | 248 | parentdep = expr_alloc_symbol(sym); |
256 | } else if (parent->prompt) | 249 | } else if (parent->prompt) |
257 | parentdep = parent->prompt->visible.expr; | 250 | parentdep = parent->prompt->visible.expr; |
@@ -260,16 +253,7 @@ void menu_finalize(struct menu *parent) | |||
260 | 253 | ||
261 | for (menu = parent->list; menu; menu = menu->next) { | 254 | for (menu = parent->list; menu; menu = menu->next) { |
262 | basedep = expr_transform(menu->dep); | 255 | basedep = expr_transform(menu->dep); |
263 | dep = parentdep; | 256 | basedep = expr_alloc_and(expr_copy(parentdep), basedep); |
264 | if (sym && sym_is_choice(sym) && menu->sym) { | ||
265 | enum symbol_type type = menu->sym->type; | ||
266 | |||
267 | if (type == S_UNKNOWN) | ||
268 | type = sym->type; | ||
269 | if (type != S_TRISTATE) | ||
270 | dep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes); | ||
271 | } | ||
272 | basedep = expr_alloc_and(expr_copy(dep), basedep); | ||
273 | basedep = expr_eliminate_dups(basedep); | 257 | basedep = expr_eliminate_dups(basedep); |
274 | menu->dep = basedep; | 258 | menu->dep = basedep; |
275 | if (menu->sym) | 259 | if (menu->sym) |
@@ -342,8 +326,7 @@ void menu_finalize(struct menu *parent) | |||
342 | "values not supported"); | 326 | "values not supported"); |
343 | } | 327 | } |
344 | current_entry = menu; | 328 | current_entry = menu; |
345 | if (menu->sym->type == S_UNKNOWN) | 329 | menu_set_type(sym->type); |
346 | menu_set_type(sym->type); | ||
347 | menu_add_symbol(P_CHOICE, sym, NULL); | 330 | menu_add_symbol(P_CHOICE, sym, NULL); |
348 | prop = sym_get_choice_prop(sym); | 331 | prop = sym_get_choice_prop(sym); |
349 | for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr) | 332 | for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr) |