From 4610ae38d58b71ce5f716aa118b16cd21c38b6fa Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 5 Feb 2023 15:40:53 -0700 Subject: [PATCH] Correct SPL use of STM32MP15X_STM32IMAGE This converts 1 usage of this option to the non-SPL form, since there is no SPL_STM32MP15X_STM32IMAGE defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-stm32mp/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c index 3b4c05d745..de5c5a55ea 100644 --- a/arch/arm/mach-stm32mp/fdt.c +++ b/arch/arm/mach-stm32mp/fdt.c @@ -505,7 +505,7 @@ int ft_system_setup(void *blob, struct bd_info *bd) * under CONFIG_STM32MP15x_STM32IMAGE only for compatibility * when FIP is not used by TF-A */ - if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) && + if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE) && !tee_find_device(NULL, NULL, NULL, NULL)) stm32_fdt_disable_optee(blob); } -- 2.39.5