Skip to contentSkip to conversation

arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0

PATCH In review Khasim Mohammed 2 participants 2 messages Dec 8, 2020 – Dec 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0

SCP firmware recipes are updated to build SCP firmware version 2.7.0 for N1SDP

Change-Id Ic42fac178cf4ac9e87127e9b6258c9bd15101906
---
 meta-arm-bsp/conf/machine/n1sdp.conf                       | 2 +-
 .../recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc        | 3 ---
 .../recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend    | 1 -
 .../recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend    | 7 +++++++
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
meta-arm-bsp/conf/machine/n1sdp.conf +1 -1
index 1f11acd..441d8c6 100644
@@ -31,7 +31,7 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
 EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
 
-PREFERRED_VERSION_scp-firmware ?= "2.6%"
+PREFERRED_VERSION_scp-firmware ?= "2.7%"
 
 #UEFI EDK2 firmware
 EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc +0 -3
index efa3acb..635ec39 100644
@@ -1,6 +1,5 @@
 # N1SDP specific SCP configurations and build instructions
 
-SRCREV        = "350be71a2ecef588b8ff5a095a0840de23506e45"
 SCP_PLATFORM  = "n1sdp"
 SCP_LOG_LEVEL = "INFO"
 
@@ -12,8 +11,6 @@ SRC_URI_append = " \
 
 COMPATIBLE_MACHINE_n1sdp = "n1sdp"
 
-PV = "2.6.0+git${SRCPV}"
-
 DEPENDS += "fiptool-native"
 DEPENDS += "virtual/trusted-firmware-a"
 
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend +0 -1
index b760ba7..06b236b 100644
@@ -2,7 +2,6 @@
 
 MACHINE_SCP_REQUIRE ?= ""
 
-MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
 MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
 MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc"
 MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend new file +7 -0
new file mode 100644
index 0000000..53bd022
@@ -0,0 +1,7 @@
+# Include machine specific SCP configurations
+
+MACHINE_SCP_REQUIRE ?= ""
+
+MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
+
+require ${MACHINE_SCP_REQUIRE}
Signature · 1 line
2.17.1
#1 lore raw
Quoted 4 lines · Khasim Mohammed

SCP firmware recipes are updated to build SCP firmware version 2.7.0 for N1SDP

Change-Id Ic42fac178cf4ac9e87127e9b6258c9bd15101906

Taking Ross version of the patch.

Thanks,
Jon

Quoted 73 lines
---
 meta-arm-bsp/conf/machine/n1sdp.conf                       | 2 +-
 .../recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc        | 3 ---
 .../recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend    | 1 -
 .../recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend    | 7 +++++++
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
meta-arm-bsp/conf/machine/n1sdp.conf +1 -1
index 1f11acd..441d8c6 100644
@@ -31,7 +31,7 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
 EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
 
-PREFERRED_VERSION_scp-firmware ?= "2.6%"
+PREFERRED_VERSION_scp-firmware ?= "2.7%"
 
 #UEFI EDK2 firmware
 EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc +0 -3
index efa3acb..635ec39 100644
@@ -1,6 +1,5 @@
 # N1SDP specific SCP configurations and build instructions
 
-SRCREV        = "350be71a2ecef588b8ff5a095a0840de23506e45"
 SCP_PLATFORM  = "n1sdp"
 SCP_LOG_LEVEL = "INFO"
 
@@ -12,8 +11,6 @@ SRC_URI_append = " \
 
 COMPATIBLE_MACHINE_n1sdp = "n1sdp"
 
-PV = "2.6.0+git${SRCPV}"
-
 DEPENDS += "fiptool-native"
 DEPENDS += "virtual/trusted-firmware-a"
 
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend +0 -1
index b760ba7..06b236b 100644
@@ -2,7 +2,6 @@
 
 MACHINE_SCP_REQUIRE ?= ""
 
-MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
 MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
 MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc"
 MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend new file +7 -0
new file mode 100644
index 0000000..53bd022
@@ -0,0 +1,7 @@
+# Include machine specific SCP configurations
+
+MACHINE_SCP_REQUIRE ?= ""
+
+MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
+
+require ${MACHINE_SCP_REQUIRE}
Signature · 1 line
2.17.1