summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-02-06 09:57:27 -0700
committerTom Rini <trini@konsulko.com>2021-03-02 15:53:37 -0500
commit1a9e75bd5ddaad2985710baea0ecc29ad8e3d5c3 (patch)
treeca467dcfe14e2ca2218d9d5d87f218708f96a387 /common
parent2740edaf47d615aa6ed99000c8a62fad8b8d34b2 (diff)
downloadu-boot-1a9e75bd5ddaad2985710baea0ecc29ad8e3d5c3.tar.gz
u-boot-1a9e75bd5ddaad2985710baea0ecc29ad8e3d5c3.tar.bz2
u-boot-1a9e75bd5ddaad2985710baea0ecc29ad8e3d5c3.zip
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 <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c3
1 files changed, 1 insertions, 2 deletions
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);
}