@@ -524,6 +524,30 @@ void menu_finalize(struct menu *parent)
*ep = expr_alloc_one(E_LIST, NULL);
(*ep)->right.sym = menu->sym;
}
+
+ /*
+ * Flatten 'if' blocks, which do not specify a submenu and only
+ * add dependencies.
+ *
+ * (Automatic submenu creation might still create a submenu from
+ * an 'if' before this code runs.)
+ *
+ * Before:
+ *
+ * A
+ * if ...
+ * +-B
+ * +-C
+ * D
+ *
+ * After:
+ *
+ * A
+ * if ...
+ * B
+ * C
+ * D
+ */
if (menu->list && (!menu->prompt || !menu->prompt->text)) {
for (last_menu = menu->list; ; last_menu = last_menu->next) {
last_menu->parent = parent;
It is not obvious that this refers to an 'if', making the code pretty cryptic: if (menu->list && (!menu->prompt || !menu->prompt->text)) { Kconfig keeps the 'if' menu nodes even after flattening. Reflect that in the example to be accurate. No functional changes. Only comments added. Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com> --- scripts/kconfig/menu.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)