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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index e3d8408..bb91b76 100644 (file)
--- 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);
 }