diff options
| author | Tom Rini <trini@konsulko.com> | 2024-08-12 07:57:34 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-08-12 07:57:34 -0600 |
| commit | 40198f86f0741b44b8effb0278c5f363a9a79b87 (patch) | |
| tree | dc5c147ed0bccf1899b9d755c9ebaa405cc7689d /boot/bootmeth_efi.c | |
| parent | 7bd2559cb30a4e800db519e88a22a25f13c753ec (diff) | |
| parent | 2956a84ba70176333743773c9a2bf0353add65c9 (diff) | |
Merge tag 'efi-2024-10-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-10-rc3
UEFI:
* efi_loader: use list_count_nodes() in efi_protocols_per_handle()
* efi_loader: correct description of efi_get_distro_fdt_name
* boot: set correct block device name in set_efi_bootdev()
* configs: enable efidebug and EFI http boot on QEMU aarch64
Other:
* Makefile: don't use CFLAGS for environment text file
Diffstat (limited to 'boot/bootmeth_efi.c')
| -rw-r--r-- | boot/bootmeth_efi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index 39232eb2e25..6b41c0999f1 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -100,11 +100,10 @@ static void set_efi_bootdev(struct blk_desc *desc, struct bootflow *bflow) if (last_slash) *last_slash = '\0'; - log_debug("setting bootdev %s, %s, %s, %p, %x\n", - dev_get_uclass_name(media_dev), devnum_str, bflow->fname, - bflow->buf, size); dev_name = device_get_uclass_id(media_dev) == UCLASS_MASS_STORAGE ? - "usb" : dev_get_uclass_name(media_dev); + "usb" : blk_get_uclass_name(device_get_uclass_id(media_dev)); + log_debug("setting bootdev %s, %s, %s, %p, %x\n", + dev_name, devnum_str, bflow->fname, bflow->buf, size); efi_set_bootdev(dev_name, devnum_str, bflow->fname, bflow->buf, size); } |