Skip to contentSkip to conversation

arm-bsp/juno: remove commented out KCONFIG

PATCH Applied Jon Mason 2 participants 3 messages Jul 20, 2023 – Jul 21, 2023

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/2 arm-bsp/juno: remove commented out KCONFIG

---
 meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 2 --
 1 file changed, 2 deletions(-)
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +0 -2
index 38bea022..64b1e41e 100644
@@ -76,8 +76,6 @@ SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/a
 # Juno KMACHINE
 #
 COMPATIBLE_MACHINE:juno = "juno"
-#KBUILD_DEFCONFIG:juno = "defconfig"
-#KCONFIG_MODE:juno = "--alldefconfig"
 FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}"
 SRC_URI:append:juno = " \
     file://0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH 2/2 arm/linux-yocto: move 6.1 patches to a unique bbappend

Move the 3 patches only needed by the 6.1 kernel into a unique bbappend The defconfig changes cannot be moved into a config fragment because they only exist in the defconfig file (because the patches that integrated their functionality into the kernel were not merged).

---
 meta-arm/recipes-kernel/linux/linux-yocto%.bbappend        | 7 -------
 meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend | 7 +++++++
 meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend    | 7 +++++++
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend
 create mode 100644 meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
meta-arm/recipes-kernel/linux/linux-yocto%.bbappend +0 -7
index 3f2c83fd..0a42ce4a 100644
@@ -1,12 +1,5 @@
 ARMFILESPATHS := "${THISDIR}/files:"
 
-FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
-SRC_URI:append:aarch64 = " \
-    file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
-    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
-    file://0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch \
-    "
-
 COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
 FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
 SRC_URI:append:generic-arm64 = " \
meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend new file +7 -0
new file mode 100644
index 00000000..d0a0ff0e
@@ -0,0 +1,7 @@
+
+FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
+SRC_URI:append:aarch64 = " \
+    file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
+    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
+    file://0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch \
+    "
meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend new file +7 -0
new file mode 100644
index 00000000..d0a0ff0e
@@ -0,0 +1,7 @@
+
+FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
+SRC_URI:append:aarch64 = " \
+    file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
+    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
+    file://0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch \
+    "
Signature · 1 line
2.30.2
Applied
#2 lore raw
In reply to Jon Mason
Quoted 1 line · Jon Mason

Applied, thanks!

[1/2] arm-bsp/juno: remove commented out KCONFIG

      commit: 8f03838a72456fb654102e0f1355982080bbf234
[2/2] arm/linux-yocto: move 6.1 patches to a unique bbappend
      commit: b4d50a273dd3f6eb37c8fac8fab12d2bf70ffebe

Best regards,

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