From 6d7f5c09f7ab37617f0f1f17bbe2c96b7d7c407e Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Fri, 25 Jun 2021 22:33:15 +0300 Subject: [PATCH] support/testing: switch TestATFAllwinner to mainline TF-A Switch to mainline TF-A that provides basic support for H5 and A64. Note that Allwinner platform layer in TF-A does not provide support for GCC stack protection, so make sure to disable this TF-A feature. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN --- support/testing/tests/boot/test_atf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index e6c11aa742..b0be7fb308 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -33,10 +33,10 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y 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/apritzel/arm-trusted-firmware.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" + # BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y