Skip to contentSkip to conversation

kconfig: show sub-menu entries even if the prompt is hidden

PATCH New Masahiro Yamada 1 participant 1 message Oct 26, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: show sub-menu entries even if the prompt is hidden

Since commit f79dc03fe68c ("kconfig: refactor choice value calculation"), when EXPERT is disabled, nothing within the "if INPUT" ... "endif" block in drivers/input/Kconfig is displayed. This issue affects all command-line interfaces and GUI frontends.

The prompt for INPUT is hidden when EXPERT is disabled. Previously, menu_is_visible() returned true in this case; however, it now returns false, resulting in all sub-menu entries being skipped.

Here is a simplified test case illustrating the issue:

config A
bool "A" if X
default y

config B
bool "B"
depends on A

When X is disabled, A becomes unconfigurable and is forced to y. B should be displayed, as its dependency is met.

This commit restores the necessary code, so menu_is_visible() functions as it did previously.

Fixes f79dc03fe68c ("kconfig: refactor choice value calculation")

---

 scripts/kconfig/menu.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
scripts/kconfig/menu.c +12 -1
index 4addd33749bb..6587ac86d0d5 100644
@@ -533,6 +533,7 @@ bool menu_is_empty(struct menu *menu)
 
 bool menu_is_visible(struct menu *menu)
 {
+	struct menu *child;
 	struct symbol *sym;
 	tristate visible;
 
@@ -551,7 +552,17 @@ bool menu_is_visible(struct menu *menu)
 	} else
 		visible = menu->prompt->visible.tri = expr_calc_value(menu->prompt->visible.expr);
 
-	return visible != no;
+	if (visible != no)
+		return true;
+
+	if (!sym || sym_get_tristate_value(menu->sym) == no)
+		return false;
+
+	for (child = menu->list; child; child = child->next)
+		if (menu_is_visible(child))
+			return true;
+
+	return false;
 }
 
 const char *menu_get_prompt(const struct menu *menu)
Signature · 1 line
2.43.0