mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 07:01:57 +00:00
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 <kever.yang@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
4e6eeeac12
commit
a8c5112a26
1 changed files with 7 additions and 7 deletions
|
@ -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,
|
debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr,
|
||||||
gd->malloc_ptr / 1024);
|
gd->malloc_ptr / 1024);
|
||||||
#endif
|
#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
|
#ifdef CONFIG_BOOTSTAGE_STASH
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -440,6 +433,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
||||||
if (ret)
|
if (ret)
|
||||||
debug("Failed to stash bootstage: err=%d\n", ret);
|
debug("Failed to stash bootstage: err=%d\n", ret);
|
||||||
#endif
|
#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();
|
spl_board_prepare_for_boot();
|
||||||
jump_to_image_no_args(&spl_image);
|
jump_to_image_no_args(&spl_image);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue