diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-26 08:10:28 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-26 08:10:28 -0600 |
| commit | 8a2a71a4eec7afdca6377ee46b1ed7e78ec692c9 (patch) | |
| tree | 460b9a426fc254b7fd9f4048dabccfb54822ba02 /lib/efi_loader/efi_boottime.c | |
| parent | 292278d6828e6c8c6ae11bc8658586d1acc411d4 (diff) | |
| parent | 21de624eb89c647a21b06a5b0f5b186838be1d17 (diff) | |
Merge tag 'efi-2025-04-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-04-rc1-2
Documentation:
* describe creating a pflash file for qemu-system-riscv64
UEFI:
* correct logging StartImage()
* use LOGC_EFI consistently
* reduce UEFI size if HAS_BOARD_SIZE_LIMIT=y
* Update efi_run_image() to accept image and device path
* Add a version of efi_binary_run() with more parameters
* Move the fallback code from efi_run_image()
* Pass in the required parameters from EFI bootmeth
* bootmeth_efi: Support PXE booting
Other:
* Enable log filtering by function name
Diffstat (limited to 'lib/efi_loader/efi_boottime.c')
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 723a9b58691..5164cb15986 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -5,6 +5,8 @@ * Copyright (c) 2016 Alexander Graf */ +#define LOG_CATEGORY LOGC_EFI + #include <bootm.h> #include <div64.h> #include <dm/device.h> @@ -3256,11 +3258,10 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, * To get ready to call EFI_EXIT below we have to execute the * missed out steps of EFI_CALL. */ - assert(__efi_entry_check()); - EFI_PRINT("%lu returned by started image\n", - (unsigned long)((uintptr_t)exit_status & - ~EFI_ERROR_MASK)); + EFI_RETURN(exit_status); + current_image = parent_image; + return EFI_EXIT(exit_status); } |