Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Masahisa Kojima 2022-04-28 17:09:36 +09:00 committed by Heinrich Schuchardt
parent b8cd1e7fc2
commit c23bb03465
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/menu.c
View file

@ -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);

2
test/py/tests/test_bootmenu.py
View file

@ -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')