diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-23 18:42:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-23 18:42:00 -0400 |
| commit | 46a06ed82a81dfcb451fe82381c59c1d0a6667a1 (patch) | |
| tree | a4b23b20380a7850521338c5dfe5a5ab6ae47d09 /cmd/bootmenu.c | |
| parent | 9bb99fa95826d1a608737ca821977b4136a1a278 (diff) | |
| parent | d97e98c887ed8fa4a339350c02f093f03cd1cf4d (diff) | |
Merge tag 'efi-2022-07-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-07-rc1-3
Documentation:
* Document image size parameter of bootefi command
UEFI:
* avoid building partition support in SPL/TPL where not required
* improve integration of EFI subsystem and driver model
* restore ability to boot arbitrary blob
Diffstat (limited to 'cmd/bootmenu.c')
| -rw-r--r-- | cmd/bootmenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 409ef9a8480..d5734872720 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -463,7 +463,7 @@ static void bootmenu_show(int delay) } for (iter = bootmenu->first; iter; iter = iter->next) { - if (!menu_item_add(menu, iter->key, iter)) + if (menu_item_add(menu, iter->key, iter) != 1) goto cleanup; } @@ -476,7 +476,7 @@ static void bootmenu_show(int delay) init = 1; - if (menu_get_choice(menu, &choice)) { + if (menu_get_choice(menu, &choice) == 1) { iter = choice; title = strdup(iter->title); command = strdup(iter->command); |