mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
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>
This commit is contained in:
parent
7747f96f02
commit
a5bf3d891a
1 changed files with 26 additions and 9 deletions
|
@ -235,16 +235,23 @@ void menu_finalize(struct menu *parent)
|
||||||
sym = parent->sym;
|
sym = parent->sym;
|
||||||
if (parent->list) {
|
if (parent->list) {
|
||||||
if (sym && sym_is_choice(sym)) {
|
if (sym && sym_is_choice(sym)) {
|
||||||
/* find the first choice value and find out choice type */
|
/* find out choice type */
|
||||||
|
enum symbol_type type = S_UNKNOWN;
|
||||||
|
|
||||||
for (menu = parent->list; menu; menu = menu->next) {
|
for (menu = parent->list; menu; menu = menu->next) {
|
||||||
if (menu->sym) {
|
if (menu->sym && menu->sym->type != S_UNKNOWN) {
|
||||||
current_entry = parent;
|
if (type == S_UNKNOWN)
|
||||||
menu_set_type(menu->sym->type);
|
type = menu->sym->type;
|
||||||
current_entry = menu;
|
if (type != S_BOOLEAN)
|
||||||
menu_set_type(sym->type);
|
break;
|
||||||
break;
|
if (menu->sym->type == S_TRISTATE) {
|
||||||
|
type = S_TRISTATE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
current_entry = parent;
|
||||||
|
menu_set_type(type);
|
||||||
parentdep = expr_alloc_symbol(sym);
|
parentdep = expr_alloc_symbol(sym);
|
||||||
} else if (parent->prompt)
|
} else if (parent->prompt)
|
||||||
parentdep = parent->prompt->visible.expr;
|
parentdep = parent->prompt->visible.expr;
|
||||||
|
@ -253,7 +260,16 @@ void menu_finalize(struct menu *parent)
|
||||||
|
|
||||||
for (menu = parent->list; menu; menu = menu->next) {
|
for (menu = parent->list; menu; menu = menu->next) {
|
||||||
basedep = expr_transform(menu->dep);
|
basedep = expr_transform(menu->dep);
|
||||||
basedep = expr_alloc_and(expr_copy(parentdep), basedep);
|
dep = parentdep;
|
||||||
|
if (sym && sym_is_choice(sym) && menu->sym) {
|
||||||
|
enum symbol_type type = menu->sym->type;
|
||||||
|
|
||||||
|
if (type == S_UNKNOWN)
|
||||||
|
type = sym->type;
|
||||||
|
if (type != S_TRISTATE)
|
||||||
|
dep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes);
|
||||||
|
}
|
||||||
|
basedep = expr_alloc_and(expr_copy(dep), basedep);
|
||||||
basedep = expr_eliminate_dups(basedep);
|
basedep = expr_eliminate_dups(basedep);
|
||||||
menu->dep = basedep;
|
menu->dep = basedep;
|
||||||
if (menu->sym)
|
if (menu->sym)
|
||||||
|
@ -326,7 +342,8 @@ void menu_finalize(struct menu *parent)
|
||||||
"values not supported");
|
"values not supported");
|
||||||
}
|
}
|
||||||
current_entry = menu;
|
current_entry = menu;
|
||||||
menu_set_type(sym->type);
|
if (menu->sym->type == S_UNKNOWN)
|
||||||
|
menu_set_type(sym->type);
|
||||||
menu_add_symbol(P_CHOICE, sym, NULL);
|
menu_add_symbol(P_CHOICE, sym, NULL);
|
||||||
prop = sym_get_choice_prop(sym);
|
prop = sym_get_choice_prop(sym);
|
||||||
for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)
|
for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)
|
||||||
|
|
Loading…
Reference in a new issue