aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2007-10-02 16:46:49 -0400
committerSam Ravnborg <sam@neptun.(none)>2007-10-12 15:20:33 -0400
commita5bf3d891a6a0fb5aa122792d965e3774108b923 (patch)
tree9328c2fc81da5de2c6892742663ff43b9436f854 /scripts/kconfig
parent7747f96f02803afb864c095fa6800f562030e7f6 (diff)
kconfig: tristate choices with mixed tristate and boolean values
Change kconfig behavior so that mixing bool and tristate config settings in a choice is possible and has the desired effect of offering just the tristate options individually if the choice gets set to M, and a normal boolean selection if the choice gets set to Y. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/menu.c35
1 files changed, 26 insertions, 9 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index f9d0d91a3fe4..7bfa181d6ed6 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -235,16 +235,23 @@ 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 the first choice value and find out choice type */ 238 /* find out choice type */
239 enum symbol_type type = S_UNKNOWN;
240
239 for (menu = parent->list; menu; menu = menu->next) { 241 for (menu = parent->list; menu; menu = menu->next) {
240 if (menu->sym) { 242 if (menu->sym && menu->sym->type != S_UNKNOWN) {
241 current_entry = parent; 243 if (type == S_UNKNOWN)
242 menu_set_type(menu->sym->type); 244 type = menu->sym->type;
243 current_entry = menu; 245 if (type != S_BOOLEAN)
244 menu_set_type(sym->type); 246 break;
245 break; 247 if (menu->sym->type == S_TRISTATE) {
248 type = S_TRISTATE;
249 break;
250 }
246 } 251 }
247 } 252 }
253 current_entry = parent;
254 menu_set_type(type);
248 parentdep = expr_alloc_symbol(sym); 255 parentdep = expr_alloc_symbol(sym);
249 } else if (parent->prompt) 256 } else if (parent->prompt)
250 parentdep = parent->prompt->visible.expr; 257 parentdep = parent->prompt->visible.expr;
@@ -253,7 +260,16 @@ void menu_finalize(struct menu *parent)
253 260
254 for (menu = parent->list; menu; menu = menu->next) { 261 for (menu = parent->list; menu; menu = menu->next) {
255 basedep = expr_transform(menu->dep); 262 basedep = expr_transform(menu->dep);
256 basedep = expr_alloc_and(expr_copy(parentdep), basedep); 263 dep = parentdep;
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);
257 basedep = expr_eliminate_dups(basedep); 273 basedep = expr_eliminate_dups(basedep);
258 menu->dep = basedep; 274 menu->dep = basedep;
259 if (menu->sym) 275 if (menu->sym)
@@ -326,7 +342,8 @@ void menu_finalize(struct menu *parent)
326 "values not supported"); 342 "values not supported");
327 } 343 }
328 current_entry = menu; 344 current_entry = menu;
329 menu_set_type(sym->type); 345 if (menu->sym->type == S_UNKNOWN)
346 menu_set_type(sym->type);
330 menu_add_symbol(P_CHOICE, sym, NULL); 347 menu_add_symbol(P_CHOICE, sym, NULL);
331 prop = sym_get_choice_prop(sym); 348 prop = sym_get_choice_prop(sym);
332 for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr) 349 for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)