From 5d4ebb14fc7bcb3f37fe7ba201c0670a6d56dc8b Mon Sep 17 00:00:00 2001 From: Jason Zhu Date: Wed, 25 Nov 2020 10:37:09 +0800 Subject: [PATCH] spl: modify the spl log Correct the log when bring up kernel with spl directly. Signed-off-by: Jason Zhu Change-Id: Ic3204d8ddab37c3a5aac3488e209b3764e96a977 --- common/spl/spl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 5cfc1b445c..07a6d3f1f0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -563,7 +563,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2) break; #if CONFIG_IS_ENABLED(ATF) case IH_OS_ARM_TRUSTED_FIRMWARE: - printf("Jumping to U-Boot(0x%08lx) via ARM Trusted Firmware(0x%08lx)\n", + printf("Jumping to %s(0x%08lx) via ARM Trusted Firmware(0x%08lx)\n", + spl_image.next_stage == SPL_NEXT_STAGE_UBOOT ? "U-Boot" : + (spl_image.next_stage == SPL_NEXT_STAGE_KERNEL ? "Kernel" : "Unknown"), (ulong)spl_image.entry_point_bl33, (ulong)spl_image.entry_point); spl_invoke_atf(&spl_image); @@ -571,7 +573,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #endif #if CONFIG_IS_ENABLED(OPTEE) case IH_OS_OP_TEE: - printf("Jumping to U-Boot(0x%08lx) via OP-TEE(0x%08lx)\n", + printf("Jumping to %s(0x%08lx) via OP-TEE(0x%08lx)\n", + spl_image.next_stage == SPL_NEXT_STAGE_UBOOT ? "U-Boot" : + (spl_image.next_stage == SPL_NEXT_STAGE_KERNEL ? "Kernel" : "Unknown"), (ulong)spl_image.entry_point_os, (ulong)spl_image.entry_point); spl_cleanup_before_jump(&spl_image);