From 5ac42f2e5a154a3f653e41144117072a771a2e2f Mon Sep 17 00:00:00 2001 From: Damodar Santhapuri Date: Mon, 10 Aug 2020 08:32:16 +0530 Subject: [PATCH] arm-bsp/trusted-firmware-a: Add v2.3 support for juno platform Update machine/juno.conf to support tf-a v2.3 Change-Id: Ieced15e83818687c879d927bce2c4604a72b9b1e Signed-off-by: Damodar Santhapuri Signed-off-by: Ross Burton --- meta-arm-bsp/conf/machine/juno.conf | 2 +- .../trusted-firmware-a/trusted-firmware-a-juno.inc | 2 +- .../trusted-firmware-a/trusted-firmware-a_2.1.bbappend | 6 ------ .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend | 1 + 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 898a863d..5f745357 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -20,7 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm" PREFERRED_VERSION_linux-linaro-arm ?= "4.19%" -PREFERRED_VERSION_trusted-firmware-a ?= "2.1%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" 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-juno.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc index a6d8ded5..c685d7db 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc @@ -5,7 +5,7 @@ TFA_PLATFORM = "juno" TFA_DEBUG = "1" TFA_MBEDTLS = "1" TFA_UBOOT = "1" -TFA_BUILD_TARGET = "bl1 fip" +TFA_BUILD_TARGET = "bl1 bl2 bl31 fip dtbs" # Juno needs the System Control Processor Firmware DEPENDS += "virtual/control-processor-firmware" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend deleted file mode 100644 index f5f16326..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# 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.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend index 6f67b497..8743ec56 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 @@ -6,5 +6,6 @@ MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc" MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc" MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc" MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc" +MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc" require ${MACHINE_TFA_REQUIRE}