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 5fb2ffb..b577d80 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -271,7 +271,7 @@
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 fb03fa4..b4baa53 100644
--- a/test/py/tests/test_bootmenu.py
+++ b/test/py/tests/test_bootmenu.py
@@ -42,7 +42,5 @@
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')