From: Masahisa Kojima Date: Thu, 28 Apr 2022 08:09:36 +0000 (+0900) Subject: menu: always show the menu regardless of the number of entry X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-logo.png?a=commitdiff_plain;h=c23bb03465c1107495b90c4b396d37a0bbe90bfc;p=u-boot.git 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 Adjust test/py/tests/test_bootmenu.py Reviewed-by: Heinrich Schuchardt --- diff --git a/common/menu.c b/common/menu.c index 5fb2ffbd06..b577d80b4f 100644 --- 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 fb03fa417b..b4baa534aa 100644 --- 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')