diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-27 09:11:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-27 09:11:25 -0400 |
| commit | 0d4823fbebae6ebbf558a9325d86b37c67d848d9 (patch) | |
| tree | 46c84c5039fc1d2ce0ff441e32603de406976db5 /common/spl/spl.c | |
| parent | df59b7d23be71db03275e4c1b243e67397b50f9a (diff) | |
| parent | 65b3f56d42e5ddc9183843723cf735950f062410 (diff) | |
Merge tag 'u-boot-stm32-20210727' of https://source.denx.de/u-boot/custodians/u-boot-stm
- FIP Enable OP-TEE and TZC support in SPL for STM32MP15 SoC
- Add stm32mp15 missing SPI clock support
- Manage pull-up on gpio button STM32MP15 boards
- Correct STM32MP15 boot when TAMPER registers are invalid
- Fix EMMC pinmux on STM32MP15 Avenger96 board
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 3ec16d0de6..d1b072d82c 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -167,6 +167,10 @@ __weak void spl_board_prepare_for_linux(void) /* Nothing to do! */ } +__weak void spl_board_prepare_for_optee(void *fdt) +{ +} + __weak void spl_board_prepare_for_boot(void) { /* Nothing to do! */ @@ -763,6 +767,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #if CONFIG_IS_ENABLED(OPTEE) 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); break; |