diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-01 13:17:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-01 15:00:56 -0600 |
| commit | 65fbdab27224ee3943a89496b21862db83c34da2 (patch) | |
| tree | 775a0a54066c2e9a6bbba201676e3d896b5cb0e2 /boot/bootflow_menu.c | |
| parent | 3f772959501c99fbe5aa0b22a36efe3478d1ae1c (diff) | |
| parent | b4cbd1a257d4027038b4f997d73bdb0a066db045 (diff) | |
Merge branch 'next'
Diffstat (limited to 'boot/bootflow_menu.c')
| -rw-r--r-- | boot/bootflow_menu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c index 16f9cd8f8ca..9d0dc352f97 100644 --- a/boot/bootflow_menu.c +++ b/boot/bootflow_menu.c @@ -8,8 +8,8 @@ #define LOG_CATEGORY UCLASS_BOOTSTD -#include <common.h> #include <bootflow.h> +#include <bootmeth.h> #include <bootstd.h> #include <cli.h> #include <dm.h> @@ -77,6 +77,7 @@ int bootflow_menu_new(struct expo **expp) last_bootdev = NULL; for (ret = bootflow_first_glob(&bflow), i = 0; !ret && i < 36; ret = bootflow_next_glob(&bflow), i++) { + struct bootmeth_uc_plat *ucp; char str[2], *label, *key; uint preview_id; bool add_gap; @@ -84,6 +85,11 @@ int bootflow_menu_new(struct expo **expp) if (bflow->state != BOOTFLOWST_READY) continue; + /* No media to show for BOOTMETHF_GLOBAL bootmeths */ + ucp = dev_get_uclass_plat(bflow->method); + if (ucp->flags & BOOTMETHF_GLOBAL) + continue; + *str = i < 10 ? '0' + i : 'A' + i - 10; str[1] = '\0'; key = strdup(str); |