diff options
| author | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2021-07-15 22:19:24 +0300 |
|---|---|---|
| committer | Patrick Delaunay <patrick.delaunay@foss.st.com> | 2021-07-27 10:47:40 +0300 |
| commit | a25d6b65c21b1298712c75604ff606025cb40267 (patch) | |
| tree | 413b09b4b710f1167df3ef9cfc83d3a856a91037 | |
| parent | 5f6e5c37c67381b9790f55a34640415939a479a5 (diff) | |
| download | u-boot-a25d6b65c21b1298712c75604ff606025cb40267.tar.xz | |
spl: Introduce spl_board_prepare_for_optee() hook
OP-TEE requires some particular setup, which is not needed for linux
or other payloads. Add a hook for platform-specific code to perform
any OP-TEE related configuration and initialization.
A weak function is used because it is symmetrical to other
spl_board_prepare_for_*() implementations. A solution to avoid the use
of weak functions would trivially apply to all these implementations.
However, re-designing this is beyond the scope of this patch.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
| -rw-r--r-- | common/spl/spl.c | 5 | ||||
| -rw-r--r-- | include/spl.h | 14 |
2 files changed, 19 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; diff --git a/include/spl.h b/include/spl.h index 74a1939452..925b6f0cc6 100644 --- a/include/spl.h +++ b/include/spl.h @@ -432,6 +432,20 @@ int spl_parse_image_header(struct spl_image_info *spl_image, const struct image_header *header); void spl_board_prepare_for_linux(void); + +/** + * spl_board_prepare_for_optee() - Prepare board for an OPTEE payload + * + * Prepares the board for booting an OP-TEE payload. Initialization is platform + * specific, and may include configuring the TrustZone memory, and other + * initialization steps required by OP-TEE. + * Note that @fdt is not used directly by OP-TEE. OP-TEE passes this @fdt to + * its normal world target. This target is not guaranteed to be u-boot, so @fdt + * changes that would normally be done by u-boot should be done in this step. + * + * @fdt: Devicetree that will be passed on, or NULL + */ +void spl_board_prepare_for_optee(void *fdt); void spl_board_prepare_for_boot(void); int spl_board_ubi_load_image(u32 boot_device); int spl_board_boot_device(u32 boot_device); |