Skip to contentSkip to conversation

arm/linux-yocto: change defconfig patch for 6.4

PATCH Applied Jon Mason 3 participants 4 messages Aug 21, 2023

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm/linux-yocto: change defconfig patch for 6.4

Use the patch that Mikko Rapeli is trying to upstream to work around the Nuvoton defconfig issue instead of reverting the patch that added the platform to the kernel.

---
 ...g-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch | 50 +++++++++++++++++++
 ...config-Add-Nuvoton-NPCM-family-suppo.patch | 45 -----------------
 .../linux/linux-yocto%.bbappend               |  5 ++
 .../linux/linux-yocto-rt_6.1%.bbappend        |  1 -
 .../linux/linux-yocto_6.1%.bbappend           |  1 -
 5 files changed, 55 insertions(+), 47 deletions(-)
 create mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch
 delete mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch
meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch new file +50 -0
new file mode 100644
index 00000000..d7f01853
@@ -0,0 +1,50 @@
+From 94a5e7ffe5855272708a94190820534c4f51bdd8 Mon Sep 17 00:00:00 2001
+From: Mikko Rapeli <[email protected]>
+Date: Tue, 15 Aug 2023 10:36:56 +0300
+Subject: [PATCH] arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y
+
+There is no code for this config option and enabling it in defconfig
+causes warnings from tools which are detecting unused and obsolete
+kernel config flags since the flag will be completely missing from
+effective build config after "make olddefconfig".
+
+Fixes yocto kernel recipe build time warning:
+
+WARNING: [kernel config]: This BSP contains fragments with warnings:
+...
+[INFO]: the following symbols were not found in the active
+configuration:
+     - CONFIG_COMMON_CLK_NPCM8XX
+
+The flag was added with commit 45472f1e5348c7b755b4912f2f529ec81cea044b
+v5.19-rc4-15-g45472f1e5348 so 6.1 and 6.4 stable kernel trees are
+affected.
+
+Fixes: 45472f1e5348c7b755b4912f2f529ec81cea044b ("arm64: defconfig: Add Nuvoton NPCM family support")
+Cc: [email protected]
+Cc: Bruce Ashfield <[email protected]>
+Cc: Jon Mason <[email protected]>
+Cc: Jon Mason <[email protected]>
+Cc: Ross Burton <[email protected]>
+Cc: Arnd Bergmann <[email protected]>
+Signed-off-by: Mikko Rapeli <[email protected]>
+
+Signed-off-by: Jon Mason <[email protected]>
+Upstream-Status: Inappropriate
+
+---
+ arch/arm64/configs/defconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index 0777bcae9104..1cf24537fda2 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -1146,7 +1146,6 @@ CONFIG_COMMON_CLK_S2MPS11=y
+ CONFIG_COMMON_CLK_PWM=y
+ CONFIG_COMMON_CLK_RS9_PCIE=y
+ CONFIG_COMMON_CLK_VC5=y
+-CONFIG_COMMON_CLK_NPCM8XX=y
+ CONFIG_COMMON_CLK_BD718XX=m
+ CONFIG_CLK_RASPBERRYPI=m
+ CONFIG_CLK_IMX8MM=y
meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch deleted +0 -45

45 lines not on this page · raw message

meta-arm/recipes-kernel/linux/linux-yocto%.bbappend +5 -0
index 0a42ce4a..9d5266ba 100644
@@ -1,5 +1,10 @@
 ARMFILESPATHS := "${THISDIR}/files:"
 
+FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
+SRC_URI:append:aarch64 = " \
+     file://0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.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 +0 -1
index d0a0ff0e..4d3beb1d 100644
@@ -2,6 +2,5 @@
 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 +0 -1
index d0a0ff0e..4d3beb1d 100644
@@ -2,6 +2,5 @@
 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
#1 lore raw

Hi,

Quoted 44 lines · Jon Mason

Use the patch that Mikko Rapeli is trying to upstream to work around the Nuvoton defconfig issue instead of reverting the patch that added the platform to the kernel.

---
 ...g-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch | 50 +++++++++++++++++++
 ...config-Add-Nuvoton-NPCM-family-suppo.patch | 45 -----------------
 .../linux/linux-yocto%.bbappend               |  5 ++
 .../linux/linux-yocto-rt_6.1%.bbappend        |  1 -
 .../linux/linux-yocto_6.1%.bbappend           |  1 -
 5 files changed, 55 insertions(+), 47 deletions(-)
 create mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch
 delete mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch
meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch new file +23 -0
new file mode 100644
index 00000000..d7f01853
@@ -0,0 +1,50 @@
+From 94a5e7ffe5855272708a94190820534c4f51bdd8 Mon Sep 17 00:00:00 2001
+From: Mikko Rapeli <[email protected]>
+Date: Tue, 15 Aug 2023 10:36:56 +0300
+Subject: [PATCH] arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y
+
+There is no code for this config option and enabling it in defconfig
+causes warnings from tools which are detecting unused and obsolete
+kernel config flags since the flag will be completely missing from
+effective build config after "make olddefconfig".
+
+Fixes yocto kernel recipe build time warning:
+
+WARNING: [kernel config]: This BSP contains fragments with warnings:
+...
+[INFO]: the following symbols were not found in the active
+configuration:
+     - CONFIG_COMMON_CLK_NPCM8XX
+
+The flag was added with commit 45472f1e5348c7b755b4912f2f529ec81cea044b
+v5.19-rc4-15-g45472f1e5348 so 6.1 and 6.4 stable kernel trees are
+affected.
+
+Fixes: 45472f1e5348c7b755b4912f2f529ec81cea044b ("arm64: defconfig: Add Nuvoton NPCM family support")

meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch line 33

Quoted 10 lines
meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch new file +10 -0
+Cc: [email protected]
+Cc: Bruce Ashfield <[email protected]>
+Cc: Jon Mason <[email protected]>
+Cc: Jon Mason <[email protected]>
+Cc: Ross Burton <[email protected]>
+Cc: Arnd Bergmann <[email protected]>
+Signed-off-by: Mikko Rapeli <[email protected]>
+
+Signed-off-by: Jon Mason <[email protected]>
+Upstream-Status: Inappropriate

Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-arm-kernel/2023-August/859760.html]

Cheers,

-Mikko

#2 lore raw
Quoted 51 lines · Mikko Rapeli

Hi,

Quoted 48 lines · Jon Mason

Use the patch that Mikko Rapeli is trying to upstream to work around the Nuvoton defconfig issue instead of reverting the patch that added the platform to the kernel.

---
 ...g-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch | 50 +++++++++++++++++++
 ...config-Add-Nuvoton-NPCM-family-suppo.patch | 45 -----------------
 .../linux/linux-yocto%.bbappend               |  5 ++
 .../linux/linux-yocto-rt_6.1%.bbappend        |  1 -
 .../linux/linux-yocto_6.1%.bbappend           |  1 -
 5 files changed, 55 insertions(+), 47 deletions(-)
 create mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch
 delete mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch
meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch new file +27 -0
new file mode 100644
index 00000000..d7f01853
@@ -0,0 +1,50 @@
+From 94a5e7ffe5855272708a94190820534c4f51bdd8 Mon Sep 17 00:00:00 2001
+From: Mikko Rapeli <[email protected]>
+Date: Tue, 15 Aug 2023 10:36:56 +0300
+Subject: [PATCH] arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y
+
+There is no code for this config option and enabling it in defconfig
+causes warnings from tools which are detecting unused and obsolete
+kernel config flags since the flag will be completely missing from
+effective build config after "make olddefconfig".
+
+Fixes yocto kernel recipe build time warning:
+
+WARNING: [kernel config]: This BSP contains fragments with warnings:
+...
+[INFO]: the following symbols were not found in the active
+configuration:
+     - CONFIG_COMMON_CLK_NPCM8XX
+
+The flag was added with commit 45472f1e5348c7b755b4912f2f529ec81cea044b
+v5.19-rc4-15-g45472f1e5348 so 6.1 and 6.4 stable kernel trees are
+affected.
+
+Fixes: 45472f1e5348c7b755b4912f2f529ec81cea044b ("arm64: defconfig: Add Nuvoton NPCM family support")
+Cc: [email protected]
+Cc: Bruce Ashfield <[email protected]>
+Cc: Jon Mason <[email protected]>
+Cc: Jon Mason <[email protected]>
Quoted 8 lines

meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch line 33

Quoted 6 lines
meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch new file +6 -0
+Cc: Ross Burton <[email protected]>
+Cc: Arnd Bergmann <[email protected]>
+Signed-off-by: Mikko Rapeli <[email protected]>
+
+Signed-off-by: Jon Mason <[email protected]>
+Upstream-Status: Inappropriate

Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-arm-kernel/2023-August/859760.html]

Good catch, patch updated (not resending, as this is a fairly trivial change).

Thanks,
Jon

Quoted 5 lines

Cheers,

-Mikko

Applied
#3 lore raw
In reply to Jon Mason
Quoted 5 lines · Jon Mason

Use the patch that Mikko Rapeli is trying to upstream to work around the Nuvoton defconfig issue instead of reverting the patch that added the platform to the kernel.

Applied, thanks!

[1/1] arm/linux-yocto: change defconfig patch for 6.4

      commit: 5b8329a99f5fb6497575612ae677e03decf2e3b2

Best regards,

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