From 69ac9fdbc46f28dbc6f013200e5cf13dd6f0c2aa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 5 Nov 2023 19:37:18 +0100 Subject: [PATCH] configs/stm32mp157c_odyssey_defconfig: use a fixed TF-A version Commit f20589cbc7a (configs/stm32mp157c_odyssey: new defconfig) forgot to specify a fixed TF-A version, so do that now. When the defconfig was added, the default version was v2.5 - So use that. Similarly to the other stm32mp1 defconfigs, this needs disabling -Werror with E=0 to fix a build issue with GCC >= 12. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/stm32mp157c_odyssey_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/stm32mp157c_odyssey_defconfig b/configs/stm32mp157c_odyssey_defconfig index 15b9a63b39..2d3600410a 100644 --- a/configs/stm32mp157c_odyssey_defconfig +++ b/configs/stm32mp157c_odyssey_defconfig @@ -17,8 +17,10 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-odyssey.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-odyssey.dtb E=0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y