diff options
| author | Tom Rini <[email protected]> | 2026-01-20 08:31:34 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-20 08:31:34 -0600 |
| commit | a4dc1c3b7d563ac823bf351a656100c3fb2d6424 (patch) | |
| tree | 7044b36a84f95155e860e386bc0b89a752e88227 /boot | |
| parent | 55ca2110d74f8e5a594aecc11ce4103dc73e9e02 (diff) | |
| parent | 8304f3226700561d219850ee3f542df37373c843 (diff) | |
Merge tag 'efi-2026-04-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2026-04-rc1-2
CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/29050
Documentation:
* Update StarFive JH7110 common description
* Add TI AM62D documentation
* Update urllib3 version for building
* Update links to doc/develop/falcon.rst
* Describe QEMU networking
* kdoc: handle the obsolescensce of docutils.ErrorString()
* Fix typo "addtional" -> "additional" in pflash section.
UEFI:
* Fix boot failure from FIT with compressed EFI binary
Others:
* cmd/meminfo: Correct displaying addresses above 4 GiB
* test:
- Consider configuration in meminfo test
- Consider initf_malloc is only traced with EARLY_TRACE
- Clean up test_trace.py code
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootm_os.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boot/bootm_os.c b/boot/bootm_os.c index 88f7c183867..ae20b555f5c 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -509,11 +509,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->os.image_start, images->os.image_len); + image_buf = map_sysmem(images->os.load, images->os.image_len); /* Run EFI image */ printf("## Transferring control to EFI (at address %08lx) ...\n", - images->os.image_start); + images->os.load); bootstage_mark(BOOTSTAGE_ID_RUN_OS); ret = efi_binary_run(image_buf, images->os.image_len, |