<div dir="ltr"><div dir="ltr">Hello Patrick,</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, 2 Sept 2021 at 11:56, Patrick Delaunay <<a href="mailto:patrick.delaunay@foss.st.com">patrick.delaunay@foss.st.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Add stub for tee_find_device function when CONFIG_TEE is not activated<br>
to simplify the caller code.<br>
<br>
This patch allows to remove the CONFIG_IS_ENABLED(OPTEE) tests<br>
for stm32 platform.<br>
<br>
Signed-off-by: Patrick Delaunay <<a href="mailto:patrick.delaunay@foss.st.com" target="_blank">patrick.delaunay@foss.st.com</a>><br>
---<br>
<br>
arch/arm/mach-stm32mp/fdt.c | 1 -<br>
board/st/common/stm32mp_mtdparts.c | 3 +--<br>
include/tee.h | 11 +++++++++++<br>
3 files changed, 12 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c<br>
index a19e954cf7..91330a68a4 100644<br>
--- a/arch/arm/mach-stm32mp/fdt.c<br>
+++ b/arch/arm/mach-stm32mp/fdt.c<br>
@@ -341,7 +341,6 @@ int ft_system_setup(void *blob, struct bd_info *bd)<br>
* when FIP is not used by TF-A<br>
*/<br>
if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) &&<br>
- CONFIG_IS_ENABLED(OPTEE) &&<br>
!tee_find_device(NULL, NULL, NULL, NULL))<br>
stm32_fdt_disable_optee(blob);<br>
<br>
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c<br>
index 8b636d62fa..18878424c7 100644<br>
--- a/board/st/common/stm32mp_mtdparts.c<br>
+++ b/board/st/common/stm32mp_mtdparts.c<br>
@@ -119,8 +119,7 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts)<br>
}<br>
<br>
#ifdef CONFIG_STM32MP15x_STM32IMAGE<br>
- if (!serial && CONFIG_IS_ENABLED(OPTEE) &&<br>
- tee_find_device(NULL, NULL, NULL, NULL))<br>
+ if (!serial && tee_find_device(NULL, NULL, NULL, NULL))<br>
tee = true;<br>
#endif<br>
<br>
diff --git a/include/tee.h b/include/tee.h<br>
index 2ef29bfc8f..44e9cd4321 100644<br>
--- a/include/tee.h<br>
+++ b/include/tee.h<br>
@@ -307,11 +307,22 @@ bool tee_shm_is_registered(struct tee_shm *shm, struct udevice *dev);<br>
* Returns a probed TEE device of the first TEE device matched by the<br>
* match() callback or NULL.<br>
*/<br>
+#if CONFIG_IS_ENABLED(TEE)<br>
struct udevice *tee_find_device(struct udevice *start,<br>
int (*match)(struct tee_version_data *vers,<br>
const void *data),<br>
const void *data,<br>
struct tee_version_data *vers);<br>
+#else<br>
+static inline struct udevice *tee_find_device(struct udevice *start,<br>
+ int (*match)(struct tee_version_data *vers,<br>
+ const void *data),<br>
+ const void *data,<br>
+ struct tee_version_data *vers)<br>
+{<br>
+ return NULL;<br>
+}<br>
+#endif<br>
<br>
/**<br>
* tee_get_version() - Query capabilities of TEE device<br>
-- <br>
2.25.1<br>
<br></blockquote><div><br></div><div>Acked-by: Etienne Carriere <<a href="mailto:etienne.carriere@inaro.org">etienne.carriere@inaro.org</a>></div><div> </div></div></div>