From a8c5112a269b943253ee57863057fd4a3abe180f Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Wed, 13 Sep 2017 18:24:24 +0800 Subject: [PATCH] spl: stash bootstage info before jump to next stage Since we may jump to next stage like ATF/OP-TEE instead of U-Boot, we need to stash the bootstage info before it. Signed-off-by: Kever Yang Reviewed-by: Simon Glass --- common/spl/spl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index ce9819e4db..4afbe97fc1 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -424,13 +424,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2) debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr, gd->malloc_ptr / 1024); #endif - - if (CONFIG_IS_ENABLED(ATF_SUPPORT)) { - debug("loaded - jumping to U-Boot via ATF BL31.\n"); - bl31_entry(); - } - - debug("loaded - jumping to U-Boot...\n"); #ifdef CONFIG_BOOTSTAGE_STASH int ret; @@ -440,6 +433,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2) if (ret) debug("Failed to stash bootstage: err=%d\n", ret); #endif + + if (CONFIG_IS_ENABLED(ATF_SUPPORT)) { + debug("loaded - jumping to U-Boot via ATF BL31.\n"); + bl31_entry(); + } + + debug("loaded - jumping to U-Boot...\n"); spl_board_prepare_for_boot(); jump_to_image_no_args(&spl_image); } -- 2.25.1