Revert "kconfig: tristate choices with mixed tristate and boolean values" (e8b8c977) · Commits · 戴 / test

This reverts commit . David Brownell notes that this causes a regression visible in the drivers/usb/gadget Kconfig file: "That Kconfig hasn't changed (other than adding new drivers), and it's worked that way for several years now ... so the issue seems to be changes in menuconfig/kconfig/etc semantics. The issue is that when USB_GADGET=m, it's no longer possible to configure peripheral controller drivers as modules ... the controller drivers can now only be configured for static linkage. It should be making a choice of one of the controller drivers which could work on the target system, and allow that driver to be linked either as a module (ok iff USB_GADGET=m) or statically." Reverting this commit resolves the problem, and also fixes a second problem that David noticed: various dependent options couldn't be enabled. Tested-and-reported-by:

David Brownell <david-b@pacbell.net> Cc: Randy Dunlap <rdunlap@xenotime.net> Cc: Jan Beulich <jbeulich@novell.com>, Cc: Andrew Morton <akpm@linux-foundation.org>, Cc: Sam Ravnborg <sam@ravnborg.org>, Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

scripts/kconfig/menu.c

+9 −26

Original line number	Diff line number	Diff line
		@@ -235,23 +235,16 @@ void menu_finalize(struct menu *parent)
		sym = parent->sym;
		if (parent->list) {
		if (sym && sym_is_choice(sym)) {
		/* find out choice type */
		enum symbol_type type = S_UNKNOWN;

		/* find the first choice value and find out choice type */
		for (menu = parent->list; menu; menu = menu->next) {
		if (menu->sym && menu->sym->type != S_UNKNOWN) {
		if (type == S_UNKNOWN)
		type = menu->sym->type;
		if (type != S_BOOLEAN)
		break;
		if (menu->sym->type == S_TRISTATE) {
		type = S_TRISTATE;
		if (menu->sym) {
		current_entry = parent;
		menu_set_type(menu->sym->type);
		current_entry = menu;
		menu_set_type(sym->type);
		break;
		}
		}
		}
		current_entry = parent;
		menu_set_type(type);
		parentdep = expr_alloc_symbol(sym);
		} else if (parent->prompt)
		parentdep = parent->prompt->visible.expr;
		@@ -260,16 +253,7 @@ void menu_finalize(struct menu *parent)

		for (menu = parent->list; menu; menu = menu->next) {
		basedep = expr_transform(menu->dep);
		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_alloc_and(expr_copy(parentdep), basedep);
		basedep = expr_eliminate_dups(basedep);
		menu->dep = basedep;
		if (menu->sym)
		@@ -342,7 +326,6 @@ void menu_finalize(struct menu *parent)
		"values not supported");
		}
		current_entry = menu;
		if (menu->sym->type == S_UNKNOWN)
		menu_set_type(sym->type);
		menu_add_symbol(P_CHOICE, sym, NULL);
		prop = sym_get_choice_prop(sym);

Admin message