diff options
| author | Tom Rini <[email protected]> | 2024-10-09 16:58:42 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-09 22:04:56 -0600 |
| commit | 1ff60b1f0a0973b5acda21232262f6745491e5af (patch) | |
| tree | 84e785eb54ca23b131931569558e6ad7d42c5a20 /boot | |
| parent | 93b9cd792089e536f2bfa85d9903fd4798209f76 (diff) | |
| parent | 5ba825194aa0e04fbd07da6f618c37d9934f4f2d (diff) | |
Merge tag 'efi-2025-01-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-01-rc1
Documentation:
* Move the generic memory-documentation to doc/
* Fix typo boormethod
UEFI:
* Delete rng-seed if having EFI RNG protocol
* Don't call restart_uboot in EFI watchdog test
* Simplify building EFI binaries in Makefile
* Show FirmwareVendor and FirmwareRevision in helloworld
* Add debug output for efi bootmeth
Other:
* CONFIG_CMD_CLK should depend on CONFIG_CLK
* simplify clk command
* enable clk command on the sandbox
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootmeth_efi.c | 11 | ||||
| -rw-r--r-- | boot/bootstd-uclass.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index 6b41c0999f1..2ad6d3b4ace 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -162,8 +162,10 @@ static int distro_efi_try_bootflow_files(struct udevice *dev, int ret, seq; /* We require a partition table */ - if (!bflow->part) + if (!bflow->part) { + log_debug("no partitions\n"); return -ENOENT; + } strcpy(fname, EFI_DIRNAME); strcat(fname, BOOTEFI_NAME); @@ -171,8 +173,10 @@ static int distro_efi_try_bootflow_files(struct udevice *dev, if (bflow->blk) desc = dev_get_uclass_plat(bflow->blk); ret = bootmeth_try_file(bflow, desc, NULL, fname); - if (ret) + if (ret) { + log_debug("File '%s' not found\n", fname); return log_msg_ret("try", ret); + } /* Since we can access the file, let's call it ready */ bflow->state = BOOTFLOWST_READY; @@ -307,6 +311,8 @@ static int distro_efi_read_bootflow(struct udevice *dev, struct bootflow *bflow) { int ret; + log_debug("dev='%s', part=%d\n", bflow->dev->name, bflow->part); + /* * bootmeth_efi doesn't allocate any buffer neither for blk nor net device * set flag to avoid freeing static buffer. @@ -332,6 +338,7 @@ static int distro_efi_boot(struct udevice *dev, struct bootflow *bflow) ulong kernel, fdt; int ret; + log_debug("distro EFI boot\n"); kernel = env_get_hex("kernel_addr_r", 0); if (!bootmeth_uses_network(bflow)) { ret = efiload_read_file(bflow, kernel); diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index 5de8efce19a..fdb8d69e320 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -122,7 +122,7 @@ static int bootstd_probe(struct udevice *dev) return 0; } -/* For now, bind the boormethod device if none are found in the devicetree */ +/* For now, bind the bootmethod device if none are found in the devicetree */ int dm_scan_other(bool pre_reloc_only) { struct driver *drv = ll_entry_start(struct driver, driver); |