diff mbox series

[2/2] arm-bsp/scp-firmware: update for 2.9

Message ID 20211206180312.1712721-2-ross.burton@arm.com
State New
Headers show
Series [1/2] arm/scp-firmware: upgrade to 2.9 | expand

Commit Message

Ross Burton Dec. 6, 2021, 6:03 p.m. UTC 
Use a generic wildcard in the arm-bsp bbappend to avoid needing to rename
in the future.

Remove the N1SDP patch as this has now been merged upstream (c5e45a7).

Remove TC? overrides which pinned it to an intermediate SHA.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...ng-coresight-debug-non-secure-access.patch | 38 -------------------
 .../scp-firmware/scp-firmware-n1sdp.inc       |  6 ---
 .../scp-firmware/scp-firmware-tc.inc          | 10 -----
 ..._2.8%.bbappend => scp-firmware_%.bbappend} |  0
 4 files changed, 54 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/n1sdp/enabling-coresight-debug-non-secure-access.patch
 rename meta-arm-bsp/recipes-bsp/scp-firmware/{scp-firmware_2.8%.bbappend => scp-firmware_%.bbappend} (100%)
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/n1sdp/enabling-coresight-debug-non-secure-access.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/n1sdp/enabling-coresight-debug-non-secure-access.patch
deleted file mode 100644
index 713f4a5e..00000000
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/files/n1sdp/enabling-coresight-debug-non-secure-access.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-[PATCH] n1sdp: Enabling CoreSight debug non-secure access
-
-Upstream-Status: Pending [Not submitted to upstream yet]
-
-Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
-
-From 194e6239737272c3fadb202deb8015cb6e8df6ec Mon Sep 17 00:00:00 2001
-From: Khasim Mohammed <khasim.mohammed@arm.com>
-Date: Thu, 22 Apr 2021 15:48:02 +0100
-Subject: [PATCH] n1sdp: Enabling CoreSight debug non-secure access
-
-This patch enables coresight to work with n1sdp c2c profile.
-
-Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
----
- product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c
-index 70e2ec3f..ff380ae2 100644
---- a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c
-+++ b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c
-@@ -466,6 +466,12 @@ static int n1sdp_system_init_primary_core(void)
-             return status;
-     }
- 
-+    else {
-+        /* Enable non-secure CoreSight debug access */
-+        FWK_LOG_INFO("N1SDP SYSTEM] Enabling CoreSight debug non-secure access");
-+        *(volatile uint32_t *)(AP_SCP_SRAM_OFFSET +
-+                               NIC_400_SEC_0_CSAPBM_OFFSET) = 0xFFFFFFFF;
-+    }
-     return FWK_SUCCESS;
- }
- 
--- 
-2.17.1
-
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
index 506eeec2..1af68dde 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
@@ -3,12 +3,6 @@ 
 SCP_PLATFORM  = "n1sdp"
 SCP_LOG_LEVEL = "INFO"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/files/:"
-
-SRC_URI:append = " \
-   file://enabling-coresight-debug-non-secure-access.patch \
-   "
-
 COMPATIBLE_MACHINE:n1sdp = "n1sdp"
 
 DEPENDS += "fiptool-native"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc
index 8751315a..cdf1bb6a 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc
@@ -1,15 +1,5 @@ 
 # TC0 specific SCP configuration
 
-# Intermediate SHA with 2.8 baseline version
-SRCREV = "26c858b46824a8d74a7593325a0124c163de65d6"
-
-PV = "2.8.0+git${SRCPV}"
-
-# This is incorporated into the SRCREV above
-SRC_URI:remove = " \
-    file://0001-smt-Make-status-and-length-volatile-for-mod_smt_memo.patch \
-    "
-
 COMPATIBLE_MACHINE = "(tc?)"
 
 SCP_PLATFORM:tc0 = "tc0"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.8%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend
similarity index 100%
rename from meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.8%.bbappend
rename to meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend