diff options
| author | Patrick Delaunay <patrick.delaunay@foss.st.com> | 2021-09-02 11:56:17 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-05 08:44:48 -0400 |
| commit | 4f53ac2adbc0f4d3bfebee1b414870e228469989 (patch) | |
| tree | e5c87fdaad364c2a78df4875fce1da3809f91b2d | |
| parent | 51827f9a8be3def01b837a2809094e2fd2703b6a (diff) | |
| download | u-boot-4f53ac2adbc0f4d3bfebee1b414870e228469989.zip u-boot-4f53ac2adbc0f4d3bfebee1b414870e228469989.tar.gz u-boot-4f53ac2adbc0f4d3bfebee1b414870e228469989.tar.bz2 | |
tee: add a stub for tee_find_device
Add stub for tee_find_device function when CONFIG_TEE is not activated
to simplify the caller code.
This patch allows to remove the CONFIG_IS_ENABLED(OPTEE) tests
for stm32 platform.
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Acked-by: Etienne Carriere <etienne.carriere@inaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
| -rw-r--r-- | arch/arm/mach-stm32mp/fdt.c | 1 | ||||
| -rw-r--r-- | board/st/common/stm32mp_mtdparts.c | 3 | ||||
| -rw-r--r-- | include/tee.h | 11 |
3 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c index a19e954..91330a6 100644 --- a/arch/arm/mach-stm32mp/fdt.c +++ b/arch/arm/mach-stm32mp/fdt.c @@ -341,7 +341,6 @@ int ft_system_setup(void *blob, struct bd_info *bd) * when FIP is not used by TF-A */ if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) && - CONFIG_IS_ENABLED(OPTEE) && !tee_find_device(NULL, NULL, NULL, NULL)) stm32_fdt_disable_optee(blob); diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c index 8b636d6..1887842 100644 --- a/board/st/common/stm32mp_mtdparts.c +++ b/board/st/common/stm32mp_mtdparts.c @@ -119,8 +119,7 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts) } #ifdef CONFIG_STM32MP15x_STM32IMAGE - if (!serial && CONFIG_IS_ENABLED(OPTEE) && - tee_find_device(NULL, NULL, NULL, NULL)) + if (!serial && tee_find_device(NULL, NULL, NULL, NULL)) tee = true; #endif diff --git a/include/tee.h b/include/tee.h index 2ef29bf..44e9cd4 100644 --- a/include/tee.h +++ b/include/tee.h @@ -307,11 +307,22 @@ bool tee_shm_is_registered(struct tee_shm *shm, struct udevice *dev); * Returns a probed TEE device of the first TEE device matched by the * match() callback or NULL. */ +#if CONFIG_IS_ENABLED(TEE) struct udevice *tee_find_device(struct udevice *start, int (*match)(struct tee_version_data *vers, const void *data), const void *data, struct tee_version_data *vers); +#else +static inline struct udevice *tee_find_device(struct udevice *start, + int (*match)(struct tee_version_data *vers, + const void *data), + const void *data, + struct tee_version_data *vers) +{ + return NULL; +} +#endif /** * tee_get_version() - Query capabilities of TEE device |