From e6770c216011ff7aa26f0760d045eca6ab2f78f0 Mon Sep 17 00:00:00 2001 From: Damodar Santhapuri Date: Fri, 26 Mar 2021 12:44:30 +0000 Subject: [PATCH] arm-bsp/juno: move tf-a version from 2.3 to 2.4 Move trusted-firmware-a version to 2.4 for juno Change-Id: Ib6e6e5537a7ecb2246d3f96b4beb8893cea605dc Signed-off-by: Damodar Santhapuri Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/juno.conf | 2 +- .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend | 1 - .../trusted-firmware-a/trusted-firmware-a_2.4.bbappend | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 8cff6c40..0e84dd30 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.4%" PREFERRED_VERSION_scp-firmware ?= "2.6%" -PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.4%" PREFERRED_VERSION_u-boot ?= "2020.07" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend index f5f16326..3c7460f2 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend @@ -1,6 +1,5 @@ # Machine specific TFAs MACHINE_TFA_REQUIRE ?= "" -MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.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 36a9e936..bdcdb53e 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 @@ -5,6 +5,7 @@ MACHINE_TFA_REQUIRE_corstone500 = "trusted-firmware-a-corstone500.inc" MACHINE_TFA_REQUIRE_corstone700 = "trusted-firmware-a-corstone700.inc" 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_tc0 = "trusted-firmware-a-tc0.inc"