diff options
| author | Masahisa Kojima <masahisa.kojima@linaro.org> | 2022-04-28 17:09:36 +0900 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2022-05-03 21:39:22 +0200 |
| commit | c23bb03465c1107495b90c4b396d37a0bbe90bfc (patch) | |
| tree | 31161c2fc644fdd6e05f79e996c0b7ab66399458 | |
| parent | b8cd1e7fc2802fb4a9f42caf5d8f8e194eb8266f (diff) | |
| download | u-boot-c23bb03465c1107495b90c4b396d37a0bbe90bfc.zip u-boot-c23bb03465c1107495b90c4b396d37a0bbe90bfc.tar.gz u-boot-c23bb03465c1107495b90c4b396d37a0bbe90bfc.tar.bz2 | |
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>
| -rw-r--r-- | common/menu.c | 2 | ||||
| -rw-r--r-- | test/py/tests/test_bootmenu.py | 2 |
2 files changed, 1 insertions, 3 deletions
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 @@ 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 fb03fa4..b4baa53 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') |