From 22c2b27249107930ddedb3ed14c575e2ae8254e6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 Oct 2018 15:25:59 +0200 Subject: [PATCH] support/testing: fix TestATFMarvell test case This test case uses a too old U-Boot version, which is affected by the infamous libfdt header conflict issue. We update U-Boot and ATF to what is used in the current version of solidrun_macchiatobin_mainline_defconfig, for which the problem no longer exists. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/107860312 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/testing/tests/boot/test_atf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index ab2239e51e..bb3701baed 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -63,7 +63,7 @@ class TestATFMarvell(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/MarvellEmbeddedProcessors/atf-marvell.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="43965481990fd92e9666cf9371a8cf478055ec7c" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -74,7 +74,7 @@ class TestATFMarvell(infra.basetest.BRTest): BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" BR2_TARGET_UBOOT_NEEDS_DTC=y """ -- 2.30.2