From e37127939b87ba0c4727784940161276ceb75403 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 26 Mar 2021 13:15:44 +0000 Subject: [PATCH] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Change-Id: I7a3e50a0f5558a135b318d70d6d75eefc570ea2f Tested-by: Thomas Abraham Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/sgi575.conf | 4 +--- .../trusted-firmware-a/trusted-firmware-a_2.2.bbappend | 1 - .../trusted-firmware-a/trusted-firmware-a_2.4.bbappend | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index 860b6d76..f5baa0fb 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -8,9 +8,7 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa75.inc EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" -# Trusted firmware v2.2 version -PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" -PREFERRED_VERSION_trusted-firmware-a ?= "2.2%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.4%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend index 73e15d0d..3c7460f2 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend @@ -1,6 +1,5 @@ # Machine specific TFAs MACHINE_TFA_REQUIRE ?= "" -MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc" require ${MACHINE_TFA_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend index bdcdb53e..827c0b91 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend @@ -7,6 +7,7 @@ MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc" MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc" MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc" MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc" +MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc" MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc" require ${MACHINE_TFA_REQUIRE}