From e5494f1fac12744217784c331b1ba3c28f319567 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 22 Aug 2021 21:46:44 +0200 Subject: [PATCH] support/testing: test_atf: bump the custom version to v2.5 This version bump is needed to pass the ATF test with hardening option enabled (-fstack-protector-strong) With the version v2.2, ATF fail due to undefined references: ./build/juno/release/bl2u/arm_tzc400.o: In function `arm_tzc400_setup': arm_tzc400.c:(.text.arm_tzc400_setup+0x10): undefined reference to `__stack_chk_guard' arm_tzc400.c:(.text.arm_tzc400_setup+0x18): undefined reference to `__stack_chk_guard' arm_tzc400.c:(.text.arm_tzc400_setup+0xb8): undefined reference to `__stack_chk_guard' arm_tzc400.c:(.text.arm_tzc400_setup+0xcc): undefined reference to `__stack_chk_fail' Since commit ccac9a5bbbd7374187a0f0017101ece0c202851d, Buildroot no longer forces ENABLE_STACK_PROTECTOR. However, we rely on the ATF build system to handle it correctly, and this wasn't the case in v2.2. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1524842591 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/boot/test_atf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index a9d5b67ac7..4fcb9b241c 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -10,7 +10,7 @@ class TestATFVexpress(infra.basetest.BRTest): BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.2" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y