diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-26 09:31:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-26 09:33:17 -0400 |
| commit | 75e33b378b3c81f1be1a8fa3815390b39fddda57 (patch) | |
| tree | e414daf1db351b5857633b89ceb784a5e2eaf4c3 /common/spl/spl.c | |
| parent | 397b35f09794e40d62d5e4f53992e2a711dc8be1 (diff) | |
| parent | ca341e98c8273e2ee74c489d6274740824c7b239 (diff) | |
Merge branch '2021-10-25-assorted-updates'
- Allow redundant environment on the eMMC HW boot partitions
- Use LMB in "loads"
- env, dfu + spi, OPTEE bugfixes
Diffstat (limited to 'common/spl/spl.c')
| -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 a9304d4148..0c08da06e8 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) |