Skip to contentSkip to conversation

arm/scp: remove support for version 2.9

PATCH Applied Jon Mason 2 participants 5 messages May 18, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/4 arm/scp: remove support for version 2.9

---
 .../scp-firmware/scp-firmware_2.10.%.bbappend |  3 +
 .../scp-firmware/scp-firmware_2.9.%.bbappend  | 10 ---
 .../scp-firmware/scp-firmware_2.9.0.bb        | 83 -------------------
 3 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.9.%.bbappend
 delete mode 100644 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.9.0.bb
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend +3 -0
index b4f5487d..bb1a48c7 100644
@@ -2,6 +2,9 @@
 
 MACHINE_SCP_REQUIRE ?= ""
 
+MACHINE_SCP_REQUIRE:juno = "scp-firmware-juno.inc"
+MACHINE_SCP_REQUIRE:n1sdp = "scp-firmware-n1sdp.inc"
+MACHINE_SCP_REQUIRE:sgi575 = "scp-firmware-sgi575.inc"
 MACHINE_SCP_REQUIRE:tc = "scp-firmware-tc.inc"
 
 require ${MACHINE_SCP_REQUIRE}
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.9.%.bbappend deleted +0 -10
deleted file mode 100644
index bb1a48c7..00000000
@@ -1,10 +0,0 @@
-# Include machine specific SCP configurations
-
-MACHINE_SCP_REQUIRE ?= ""
-
-MACHINE_SCP_REQUIRE:juno = "scp-firmware-juno.inc"
-MACHINE_SCP_REQUIRE:n1sdp = "scp-firmware-n1sdp.inc"
-MACHINE_SCP_REQUIRE:sgi575 = "scp-firmware-sgi575.inc"
-MACHINE_SCP_REQUIRE:tc = "scp-firmware-tc.inc"
-
-require ${MACHINE_SCP_REQUIRE}
meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.9.0.bb deleted +0 -83

83 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/4 arm/linux-yocto: remove tcpci for generic-arm64

Per the comment, it's not necessary post 5.12.

---
 meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg  | 2 --
 meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend | 4 ----
 2 files changed, 6 deletions(-)
 delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg
meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg deleted +0 -2
deleted file mode 100644
index 33205a9a..00000000
@@ -1,2 +0,0 @@
-# The upstream defconfig has this in 5.12 onwards, but until then set it manually.
-CONFIG_TYPEC_TCPCI=m
meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +0 -4
index 6658b91a..14cc6df1 100644
@@ -1,10 +1,6 @@
 ARMFILESPATHS := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
-FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
-SRC_URI:append:generic-arm64 = " \
-    file://tcpci.cfg \
-    "
 
 FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}"
 SRC_URI:append:qemuarm64-secureboot = " \
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/4 arm-autonomy: remove README

In reply to Jon Mason

meta-arm-autonomy has been EOLed for a release now. Remove the README and directory.

---
 meta-arm-autonomy/README.md | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 meta-arm-autonomy/README.md
meta-arm-autonomy/README.md deleted +0 -23
deleted file mode 100644
index 2e02a7f2..00000000
@@ -1,23 +0,0 @@
-meta-arm-autonomy Yocto Layer
-=============================
-
-The meta-arm-autonomy layer is being deprecated from master, with bug fixes
-only being applied to the following branches. Additionally, all support and
-maintenance of meta-arm-autonomy will stop as per the schedule below.
-
-    honister: End-of-life scheduled to June 2022
-    hardknot: End-of-life scheduled to December 2021
-    gatesgarth: End-of-life scheduled to October 2021
-    dunfell: End-of-life scheduled to October 2021
-    master: End-of-life scheduled to October 2021 and code removed
-
-
-Contributing
-------------
-This project has not put in place a process for contributions currently. If you
-would like to contribute, please contact the maintainers
-
-
-Maintainer(s)
--------------
-* Diego Sueiro <[email protected]>
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 4/4 arm/machine: used QB_GRAPICS

In reply to Jon Mason

QB_OPT_APPEND is being used for the graphics parameters, use QB_GRAPHICS instead.

---
 meta-arm-bsp/conf/machine/musca-b1.conf       | 2 +-
 meta-arm-bsp/conf/machine/musca-s1.conf       | 2 +-
 meta-arm-bsp/conf/machine/qemu-cortex-r5.conf | 2 +-
 meta-arm/conf/machine/microbit-v1.conf        | 2 +-
 meta-arm/conf/machine/qemu-cortex-a53.conf    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
meta-arm-bsp/conf/machine/musca-b1.conf +1 -1
index 073c466e..a7895b81 100644
@@ -16,7 +16,7 @@ IMAGE_CLASSES += "qemuboot"
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine musca-b1"
 QB_CPU = "-cpu cortex-m33"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_MEM = "512k"
 QB_RNG = ""
 
meta-arm-bsp/conf/machine/musca-s1.conf +1 -1
index d18c06c2..0cfd56e0 100644
@@ -15,7 +15,7 @@ IMAGE_CLASSES += "qemuboot"
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine musca-s1"
 QB_CPU = "-cpu cortex-m33"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_MEM = "512k"
 QB_RNG = ""
 
meta-arm-bsp/conf/machine/qemu-cortex-r5.conf +1 -1
index 29b37d79..5a0ea69b 100644
@@ -13,7 +13,7 @@ QB_SYSTEM_NAME = "qemu-system-aarch64"
 QB_MACHINE = "-machine xlnx-zcu102"
 QB_CPU = "-cpu cortex-r5"
 QB_MEM = "-m 64k"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_RNG = ""
 
 # Zephyr RTOS settings
meta-arm/conf/machine/microbit-v1.conf +1 -1
index 1fa2532f..6b18191e 100644
@@ -14,7 +14,7 @@ TCLIBC = "newlib"
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine microbit"
 QB_CPU = "-cpu cortex-m0"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_RNG = ""
 
 # Zephyr RTOS settings
meta-arm/conf/machine/qemu-cortex-a53.conf +1 -1
index b97cde7e..7147face 100644
@@ -11,7 +11,7 @@ TCLIBC = "newlib"
 QB_SYSTEM_NAME = "qemu-system-aarch64"
 QB_MACHINE = "-machine virt"
 QB_CPU = "-cpu cortex-a53"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 
 # Zephyr RTOS settings
 ZEPHYR_BOARD = "qemu_cortex_a53"
Signature · 1 line
2.17.1
Applied
#4 lore raw
In reply to Jon Mason
Quoted 1 line · Jon Mason

Applied, thanks!

[1/4] arm/scp: remove support for version 2.9

      commit: e50f5221a368f552333911670647808b91d78a18
[2/4] arm/linux-yocto: remove tcpci for generic-arm64
      commit: 1b7f2975e445c4dd662486c88abb6fd74835a2bf
[3/4] arm-autonomy: remove README
      commit: 8445f99eb0cc2f09b813a03319a530fbcce365df
[4/4] arm/machine: used QB_GRAPICS
      commit: 96941ae4cebd30d7b15473e904af2aed90af1e56

Best regards,

Signature · 1 line
Jon Mason <[email protected]>