[meta-arm] arm-bsp/trusted-firmware-a: adapt for patched recipe

Submitted by Ross Burton on Nov. 25, 2020, 5:46 p.m. | Patch ID: 178177

Details

Message ID 20201125174635.3789789-1-ross.burton@arm.com
State New
Headers show

Commit Message

Ross Burton Nov. 25, 2020, 5:46 p.m.
The base trusted-firmware-a recipe is now patched, but these BSPs
chose to use an intermediate SHA instead of the release.  This SHA
already contains the patch, so we need to remove it from SRC_URI.

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

---
 .../trusted-firmware-a/trusted-firmware-a-corstone700.inc   | 3 +++
 .../trusted-firmware-a/trusted-firmware-a-n1sdp.inc         | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1451): https://lists.yoctoproject.org/g/meta-arm/message/1451
Mute This Topic: https://lists.yoctoproject.org/mt/78505056/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/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc
index f48ac64..bdffec8 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc
@@ -13,6 +13,9 @@  LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 # fdts: corstone700: add NXP isp1763 node to device tree
 SRCREV_tfa = "a6f65b11529b618ff04017f64054dc661c489068"
 
+# 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}"
 
 EXTRA_OEMAKE_append = " \
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 a9cf38f..f9cb288 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,10 +8,12 @@  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 \
     "
-
-SRCREV_tfa = "dffd5192df41e77e27bb524bfe64d747c1c43522"
+# 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}"