| Message ID | 20231105183719.3811015-3-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/4] configs/stm32mp157a_dk1_defconfig: unbreak TF-A build with GCC >= 12 | expand |
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > 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 <peter@korsgaard.com> Committed to 2023.02.x and 2023.08.x, thanks.
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
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 <peter@korsgaard.com> --- configs/stm32mp157c_odyssey_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)