[meta-arm,2/2] arm-bsp/fvp-base-arm32: move to trusted-firmware-a 2.4

Submitted by Ross Burton on Nov. 23, 2020, 1:10 p.m. | Patch ID: 178113

Details

Message ID 20201123131053.2926514-2-ross.burton@arm.com
State New
Headers show

Commit Message

Ross Burton Nov. 23, 2020, 1:10 p.m.
Change-Id: I7f981d1c9456d7f821a0f57c77af763b1b523edd
Tested-by: Anders Dellien <anders.dellien@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>

---
 meta-arm-bsp/conf/machine/fvp-base-arm32.conf                   | 2 +-
 .../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(+), 2 deletions(-)

-- 
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1425): https://lists.yoctoproject.org/g/meta-arm/message/1425
Mute This Topic: https://lists.yoctoproject.org/mt/78452559/1003190
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf
index 36beca1..13bb78d 100644
--- a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf
@@ -9,7 +9,7 @@  require conf/machine/include/arm/arch-armv7a.inc
 
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_VERSION_trusted-firmware-a = "2.2%"
+PREFERRED_VERSION_trusted-firmware-a = "2.4%"
 
 # FVP u-boot configuration
 UBOOT_MACHINE = "vexpress_aemv8a_aarch32_defconfig"
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 c6bd111..73e15d0 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,7 +1,6 @@ 
 # Machine specific TFAs
 
 MACHINE_TFA_REQUIRE ?= ""
-MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc"
 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 68472a5..4a89fd5 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
@@ -2,5 +2,6 @@ 
 
 MACHINE_TFA_REQUIRE ?= ""
 MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
+MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc"
 
 require ${MACHINE_TFA_REQUIRE}