diff options
| -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') |