From 79360345fb23a42471a0c5bbdb819d991f816d66 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 8 Dec 2020 11:02:22 +0000 Subject: [PATCH] arm-bsp/trusted-firmware-a: move N1SDP to TF-A 2.4 Change-Id: I85a7b9421a6d5267c778c164b8f0e0bdd24b8407 Signed-off-by: Ross Burton Signed-off-by: Khasim Syed Mohammed Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/n1sdp.conf | 4 +--- ...sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch | 1 + .../trusted-firmware-a/trusted-firmware-a-n1sdp.inc | 6 ------ .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend | 1 - .../trusted-firmware-a/trusted-firmware-a_2.4.bbappend | 1 + 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 441d8c61..acb0f5cf 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -24,9 +24,7 @@ PREFERRED_VERSION_linux-linaro-arm ?= "5.4%" # RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168" -# Trusted firmware v2.3 version -PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" -PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.4%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch index 53a6616b..c199a7b7 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch @@ -26,6 +26,7 @@ software running on N1 SDP, including those that do not require mitigation. This patch is meant for performance evaluation purposes ONLY and should not be used for software that requires a seccomp computing environment. +Upstream-Status: Inappropriate Signed-off-by: James Yang --- plat/arm/board/n1sdp/platform.mk | 2 ++ diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc index f9cb2885..fbc43586 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc @@ -8,12 +8,6 @@ TFA_DEBUG = "1" TFA_MBEDTLS = "0" TFA_UBOOT = "0" -SRCREV_tfa = "dffd5192df41e77e27bb524bfe64d747c1c43522" - SRC_URI_append = " \ file://0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch \ " -# This is incorporated into the SRCREV above -SRC_URI_remove = "file://0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch" - -PV = "2.3+git${SRCPV}" 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 70480978..f1908f88 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 @@ -3,7 +3,6 @@ MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc" MACHINE_TFA_REQUIRE_corstone500 = "trusted-firmware-a-corstone500.inc" -MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc" MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc" MACHINE_TFA_REQUIRE_corstone700 = "trusted-firmware-a-corstone700.inc" 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 4a89fd5c..944dd7a0 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 @@ -3,5 +3,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" +MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc" require ${MACHINE_TFA_REQUIRE}