diff options
| author | Tom Rini <[email protected]> | 2025-05-01 10:48:24 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-05-01 10:48:24 -0600 |
| commit | 152fa1b7fd6b43c727e322aec7a870a33865a248 (patch) | |
| tree | b5ad2c1af26bd0e106c96c5d717178e757ccdcf1 /boot | |
| parent | 98a898e58499c78245e4fe36ee404b1b1208e32b (diff) | |
| parent | c0546426724099d94a497ea11ad79862daf37767 (diff) | |
Merge tag 'efi-2025-07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-07-rc2
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/26025
Documentation:
* ti: update bash code-block directives to prompt
* ti: k3: add language for code-block directive
* correct uthread inline documentation
UEFI:
* correctly handle EFI FIT images without initrd
* pass kernel load address not entry point for EFI FIT images
Other:
* boot:let BOOTSTAGE_RECORD_COUNT default to 50
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 2 | ||||
| -rw-r--r-- | boot/bootm_os.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index fb37d912bc9..2456856a572 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1170,7 +1170,7 @@ config BOOTSTAGE_REPORT config BOOTSTAGE_RECORD_COUNT int "Number of boot stage records to store" depends on BOOTSTAGE - default 30 + default 50 help This is the size of the bootstage record list and is the maximum number of bootstage records that can be recorded. diff --git a/boot/bootm_os.c b/boot/bootm_os.c index dc9d3e61fca..a3c7cb5332e 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -498,11 +498,11 @@ static int do_bootm_efi(int flag, struct bootm_info *bmi) /* We expect to return */ images->os.type = IH_TYPE_STANDALONE; - image_buf = map_sysmem(images->ep, images->os.image_len); + image_buf = map_sysmem(images->os.image_start, images->os.image_len); /* Run EFI image */ printf("## Transferring control to EFI (at address %08lx) ...\n", - images->ep); + images->os.image_start); bootstage_mark(BOOTSTAGE_ID_RUN_OS); ret = efi_binary_run(image_buf, images->os.image_len, |