4 files changed, 41 insertions, 16 deletions

diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 41e652a8d1f6..7cadcad8233b 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -11,7 +11,8 @@ P(conf_set_changed_callback, void,(void (*fn)(void)));
 /* menu.c */
 P(rootmenu,struct menu,);
 
-P(menu_is_visible,bool,(struct menu *menu));
+P(menu_is_visible, bool, (struct menu *menu));
+P(menu_has_prompt, bool, (struct menu *menu));
 P(menu_get_prompt,const char *,(struct menu *menu));
 P(menu_get_root_menu,struct menu *,(struct menu *menu));
 P(menu_get_parent_menu,struct menu *,(struct menu *menu));
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index fa9d633f293c..1d604738fa13 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -383,6 +383,10 @@ do_resize:
                 case 'n':
                 case 'm':
                 case '/':
+                case 'h':
+                case '?':
+                case 'z':
+                case '\n':
                         /* save scroll info */
                         *s_scroll = scroll;
                         delwin(menu);
@@ -390,8 +394,10 @@ do_resize:
                         item_set(scroll + choice);
                         item_set_selected(1);
                         switch (key) {
+                        case 'h':
+                        case '?':
+                                return 2;
                         case 's':
-                                return 3;
                         case 'y':
                                 return 3;
                         case 'n':
@@ -402,18 +408,12 @@ do_resize:
                                 return 6;
                         case '/':
                                 return 7;
+                        case 'z':
+                                return 8;
+                        case '\n':
+                                return button;
                         }
                         return 0;
-                case 'h':
-                case '?':
-                        button = 2;
-                case '\n':
-                        *s_scroll = scroll;
-                        delwin(menu);
-                        delwin(dialog);
-                        item_set(scroll + choice);
-                        item_set_selected(1);
-                        return button;
                 case 'e':
                 case 'x':
                         key = KEY_ESC;
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index a4a75190457c..2c83d3234d30 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -67,13 +67,15 @@ static const char mconf_readme[] = N_(
 "             there is a delayed response which you may find annoying.\n"
 "\n"
 "   Also, the <TAB> and cursor keys will cycle between <Select>,\n"
-"   <Exit> and <Help>\n"
+"   <Exit> and <Help>.\n"
 "\n"
 "o  To get help with an item, use the cursor keys to highlight <Help>\n"
-"   and Press <ENTER>.\n"
+"   and press <ENTER>.\n"
 "\n"
 "   Shortcut: Press <H> or <?>.\n"
 "\n"
+"o  To show hidden options, press <Z>.\n"
+"\n"
 "\n"
 "Radiolists  (Choice lists)\n"
 "-----------\n"
@@ -272,6 +274,7 @@ static int indent;
 static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
+static int show_all_options;
 
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
@@ -346,8 +349,16 @@ static void build_conf(struct menu *menu)
         int type, tmp, doint = 2;
         tristate val;
         char ch;
-
-        if (!menu_is_visible(menu))
+        bool visible;
+
+        /*
+         * note: menu_is_visible() has side effect that it will
+         * recalc the value of the symbol.
+         */
+        visible = menu_is_visible(menu);
+        if (show_all_options && !menu_has_prompt(menu))
+                return;
+        else if (!show_all_options && !visible)
                 return;
 
         sym = menu->sym;
@@ -606,6 +617,9 @@ static void conf(struct menu *menu)
                 case 7:
                         search_conf();
                         break;
+                case 8:
+                        show_all_options = !show_all_options;
+                        break;
                 }
         }
 }
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 62e3f15ede0f..203632cc30bd 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -390,6 +390,13 @@ void menu_finalize(struct menu *parent)
         }
 }
 
+bool menu_has_prompt(struct menu *menu)
+{
+        if (!menu->prompt)
+                return false;
+        return true;
+}
+
 bool menu_is_visible(struct menu *menu)
 {
         struct menu *child;
@@ -398,6 +405,7 @@ bool menu_is_visible(struct menu *menu)
 
         if (!menu->prompt)
                 return false;
+
         sym = menu->sym;
         if (sym) {
                 sym_calc_value(sym);
@@ -407,12 +415,14 @@ bool menu_is_visible(struct menu *menu)
 
         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;
 }