| Message ID | 20210206165736.3491584-2-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 1a9e75bd5ddaad2985710baea0ecc29ad8e3d5c3 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Various minor fixes | expand |
On Sat, Feb 06, 2021 at 09:57:27AM -0700, Simon Glass wrote: > 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> Applied to u-boot/next, thanks!
diff --git a/common/spl/spl.c b/common/spl/spl.c index cdd7b05f279..42004506446 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -693,7 +693,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: @@ -740,7 +740,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); }
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> --- (no changes since v3) Changes in v3: - Show phase only for IH_OS_U_BOOT, drop the last debug() common/spl/spl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)