diff options
| author | Ricardo Salveti | 2021-10-20 15:12:06 +0300 |
|---|---|---|
| committer | Tom Rini | 2021-10-25 17:17:24 -0400 |
| commit | 949eb228f3f807feb338d29e9c94d97c22fa98b6 (patch) | |
| tree | ca643d9f848a87bd261ec7855598a6a0d14d41c5 /common/spl | |
| parent | d11d1becbd6ab67c4cc0c19bda2886b28c1fdc02 (diff) | |
arm: spl: prepare for jumping to OPTEE
Make sure to (if applicable) flush the D-cache, invalidate I-cache,
and disable MMU and caches before jumping to OPTEE.
This fixes the SDP->SPL->OPTEE boot flow on iMX6Q and most likely on
some other ARM SoCs.
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Co-developed-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index a9304d41486..0c08da06e8f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -174,6 +174,14 @@ __weak void spl_board_prepare_for_optee(void *fdt) { } +#if CONFIG_IS_ENABLED(OPTEE_IMAGE) +__weak void __noreturn jump_to_image_optee(struct spl_image_info *spl_image) +{ + spl_optee_entry(NULL, NULL, spl_image->fdt_addr, + (void *)spl_image->entry_point); +} +#endif + __weak void spl_board_prepare_for_boot(void) { /* Nothing to do! */ @@ -780,8 +788,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) case IH_OS_TEE: debug("Jumping to U-Boot via OP-TEE\n"); spl_board_prepare_for_optee(spl_image.fdt_addr); - spl_optee_entry(NULL, NULL, spl_image.fdt_addr, - (void *)spl_image.entry_point); + jump_to_image_optee(&spl_image); break; #endif #if CONFIG_IS_ENABLED(OPENSBI) |