menu: always show the menu regardless of the number of entry

To make user aware of the menu entry selection, menu always
appears regardless of the number of entry.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
Adjust test/py/tests/test_bootmenu.py
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/common/menu.c b/common/menu.c
index 5fb2ffbd065d4ed8a3dd22dddf81e8d121be5b83..b577d80b4ff6467ce34fa90f8b03ced9f3eb7048 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -271,7 +271,7 @@ int menu_get_choice(struct menu *m, void **choice)
        if (!m || !choice)
                return -EINVAL;
 
-       if (!m->prompt || m->item_cnt == 1)
+       if (!m->prompt)
                return menu_default_choice(m, choice);
 
        return menu_interactive_choice(m, choice);

diff --git a/test/py/tests/test_bootmenu.py b/test/py/tests/test_bootmenu.py
index fb03fa417b7b5ac8e589f8076eb5d77edadd88cb..b4baa534aa20954145c265e122708fcc5ca3f9fb 100644 (file)
--- a/test/py/tests/test_bootmenu.py
+++ b/test/py/tests/test_bootmenu.py
@@ -42,7 +42,5 @@ def test_bootmenu(u_boot_console):
     assert 'rc:0' in response
     u_boot_console.run_command('setenv bootmenu_default')
     u_boot_console.run_command('setenv bootmenu_0')
-    # Without bootmenu_0 no menu should be shown.
-    u_boot_console.run_command('bootmenu 2')
     u_boot_console.run_command('setenv bootmenu_1')
     u_boot_console.run_command('setenv bootmenu_2')