diff mbox series

[2/5] arm-bsp/scp-firmware: remove redundant SCP_PLATFORM

Message ID 20230710130916.3414041-2-ross.burton@arm.com
State New
Headers show
Series [1/5] arm/scp-firmware: set default SCP_PLATFORM to MACHINE | expand

Commit Message

Ross Burton July 10, 2023, 1:09 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

Now that this defaults to MACHINE, explicit SCP_PLATFORM assignments can
be removed.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-juno.inc  | 1 -
 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc | 5 ++---
 .../recipes-bsp/scp-firmware/scp-firmware-sgi575.inc         | 5 ++---
 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc    | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-juno.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-juno.inc
index f78c94b4..1f02d8e5 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-juno.inc
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-juno.inc
@@ -2,7 +2,6 @@ 
 
 COMPATIBLE_MACHINE = "juno"
 
-SCP_PLATFORM = "juno"
 FW_TARGETS = "scp"
 FW_INSTALL:append = " romfw_bypass"
 
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 811537aa..c89b132c 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
@@ -1,10 +1,9 @@ 
 # N1SDP specific SCP configurations and build instructions
 
-SCP_PLATFORM  = "n1sdp"
-SCP_LOG_LEVEL = "INFO"
-
 COMPATIBLE_MACHINE:n1sdp = "n1sdp"
 
+SCP_LOG_LEVEL = "INFO"
+
 DEPENDS += "fiptool-native"
 DEPENDS += "trusted-firmware-a"
 DEPENDS += "n1sdp-board-firmware"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc
index e1b0a854..3413822a 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc
@@ -1,6 +1,5 @@ 
 # SGI575 specific SCP configurations and build instructions
 
-SCP_PLATFORM  = "sgi575"
-SCP_LOG_LEVEL = "INFO"
-
 COMPATIBLE_MACHINE:sgi575 = "sgi575"
+
+SCP_LOG_LEVEL = "INFO"
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 3cbadad8..2c656357 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
@@ -2,5 +2,4 @@ 
 
 COMPATIBLE_MACHINE = "(tc1)"
 
-SCP_PLATFORM:tc1 = "tc1"
 FW_TARGETS = "scp"