From 1a9e75bd5ddaad2985710baea0ecc29ad8e3d5c3 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 6 Feb 2021 09:57:27 -0700 Subject: spl: Drop duplicate 'Jumping to U-Boot' message This is printed twice but we only need one message, since there is very little processing in between them. Drop the second one, since all branches of the switch() already have output. Update the U-Boot message to include the phase being jumped to. Signed-off-by: Simon Glass --- common/spl/spl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'common') diff --git a/common/spl/spl.c b/common/spl/spl.c index e3d84082f4..bb91b761fc 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -694,7 +694,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #endif switch (spl_image.os) { case IH_OS_U_BOOT: - debug("Jumping to U-Boot\n"); + debug("Jumping to %s...\n", spl_phase_name(spl_next_phase())); break; #if CONFIG_IS_ENABLED(ATF) case IH_OS_ARM_TRUSTED_FIRMWARE: @@ -741,7 +741,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2) debug("Failed to stash bootstage: err=%d\n", ret); #endif - debug("loaded - jumping to %s...\n", spl_phase_name(spl_next_phase())); spl_board_prepare_for_boot(); jump_to_image_no_args(&spl_image); } -- cgit v1.2.3