summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2020-07-18 11:54:26 +0300
committerHeinrich Schuchardt <xypron.glpk@gmx.de>2020-07-22 13:32:42 +0300
commitbf758125d826a5c09828b54c3d866490346f033c (patch)
tree6ba8b9f9f7e99cee59cad4cc86bbb6837a9ce8c1 /common
parente7d64065cb4b74357e50b54e54adc780e2f44db1 (diff)
downloadu-boot-bf758125d826a5c09828b54c3d866490346f033c.tar.xz
efi_loader: returning from UEFI FIT images
Do not reset the board when returning from an UEFI FIT image. For failed UEFI binary we already print the return status in efi_run_image. Remove duplicate output. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Diffstat (limited to 'common')
-rw-r--r--common/bootm_os.c9
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