diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-23 08:57:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-23 08:57:35 -0400 |
| commit | 56d37f1c564107e27d873181d838571b7d7860e7 (patch) | |
| tree | 41b20866e0a94e34ca76e54a2745ca7a5ba0889b /common | |
| parent | 95fc1f164723270b2b0bd8d7e2f7ba21bce66381 (diff) | |
| parent | 5ee81c6e3f9f6f851c69b1e3d2661d96671d1dd1 (diff) | |
Merge tag 'efi-2020-10-rc1-5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-10-rc1 (5)
The series provides bug fixes for:
* crash in OS when accessing UEFI variables
* returning from UEFI fit images to U-Boot
* error handling for variable services provided by OP-TEE
* error handling in EFI_FILE_PROTOCOL.Read()
* missing function documentation
The first patches needed to use intermediate certificates for
secure boot are added. (The rest of the series requires
updating sbsigntool in our CI systems.)
Logging is enabled in the bootefi command.
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm_os.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/common/bootm_os.c b/common/bootm_os.c index 6a95e0de33..e9aaddf3e6 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -542,15 +542,14 @@ static int do_bootm_efi(int flag, int argc, char *const argv[], images->ep); bootstage_mark(BOOTSTAGE_ID_RUN_OS); + /* We expect to return */ + images->os.type = IH_TYPE_STANDALONE; + image_buf = map_sysmem(images->ep, images->os.image_len); efi_ret = efi_run_image(image_buf, images->os.image_len); - if (efi_ret != EFI_SUCCESS) { - printf("## Failed to run EFI image: r = %lu\n", - efi_ret & ~EFI_ERROR_MASK); + if (efi_ret != EFI_SUCCESS) return 1; - } - return 0; } #endif |