[meta-arm,4/6] arm-bsp/scp-firmware: explicitly select scp-firmware 2.6

Submitted by Ross Burton on Nov. 25, 2020, 12:31 p.m. | Patch ID: 178174

Details

Message ID 20201125123127.3226384-4-ross.burton@arm.com
State New
Headers show

Commit Message

Ross Burton Nov. 25, 2020, 12:31 p.m.
Explicitly select scp-firmware 2.6 in all the machines that use it.

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

---
 meta-arm-bsp/conf/machine/juno.conf   | 1 +
 meta-arm-bsp/conf/machine/n1sdp.conf  | 2 ++
 meta-arm-bsp/conf/machine/sgi575.conf | 2 ++
 meta-arm-bsp/conf/machine/tc0.conf    | 5 +++--
 4 files changed, 8 insertions(+), 2 deletions(-)

-- 
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1445): https://lists.yoctoproject.org/g/meta-arm/message/1445
Mute This Topic: https://lists.yoctoproject.org/mt/78498346/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/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf
index 2f42dea..8cff6c4 100644
--- a/meta-arm-bsp/conf/machine/juno.conf
+++ b/meta-arm-bsp/conf/machine/juno.conf
@@ -20,6 +20,7 @@  SERIAL_CONSOLES = "115200;ttyAMA0"
 # Use kernel provided by yocto
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.4%"
+PREFERRED_VERSION_scp-firmware ?= "2.6%"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
 PREFERRED_VERSION_u-boot ?= "2020.07"
 
diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf
index 230c912..1f11acd 100644
--- a/meta-arm-bsp/conf/machine/n1sdp.conf
+++ b/meta-arm-bsp/conf/machine/n1sdp.conf
@@ -31,6 +31,8 @@  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%"
+
 #UEFI EDK2 firmware
 EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware"
 
diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf
index e6d447d..7714d0d 100644
--- a/meta-arm-bsp/conf/machine/sgi575.conf
+++ b/meta-arm-bsp/conf/machine/sgi575.conf
@@ -14,6 +14,8 @@  PREFERRED_VERSION_trusted-firmware-a ?= "2.2%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
 
+PREFERRED_VERSION_scp-firmware ?= "2.6%"
+
 # Use kernel provided by linaro
 KERNEL_IMAGETYPE ?= "Image"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
diff --git a/meta-arm-bsp/conf/machine/tc0.conf b/meta-arm-bsp/conf/machine/tc0.conf
index 7776dde..8d70aad 100644
--- a/meta-arm-bsp/conf/machine/tc0.conf
+++ b/meta-arm-bsp/conf/machine/tc0.conf
@@ -15,11 +15,12 @@  PREFERRED_VERSION_u-boot ?= "2020.07"
 # Trusted firmware A v2.3
 PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
-PREFERRED_VERSION_linux-arm64-ack ?= "5.4"
-
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
 
+PREFERRED_VERSION_scp-firmware ?= "2.6%"
+
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack"
+PREFERRED_VERSION_linux-arm64-ack ?= "5.4"
 
 # Cannot use the default zImage on arm64
 KERNEL_IMAGETYPE = "Image"