From bf758125d826a5c09828b54c3d866490346f033c Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 18 Jul 2020 10:54:26 +0200 Subject: [PATCH] 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 --- common/bootm_os.c | 9 ++++----- 1 file 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 -- 2.39.5