[PATCH kirkstone] arm/linux-yocto: disable CONFIG_MTD_NAND_FSL_IFC

Jon Mason <[email protected]>
Newsgroups org.yoctoproject.lists.meta-arm
Message-ID <[email protected]>
Linux stable kernel v5.15.166 added commit e59386c300198385d8bf33336de3b8c165d20d00,
which modifies the depends for the Freescale IFC NAND controller.  See
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=e59386c300198385d8bf33336de3b8c165d20d00

Because of this change, do_kernel_configcheck is logging an warning
about values not matching.  To address this issue, disable it manually
in a config fragment, but only for the affected machines in meta-arm.

Signed-off-by: Jon Mason <[email protected]>
---
 meta-arm-bsp/recipes-kernel/linux/files/no-fsl-ifc-nand.cfg | 1 +
 meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc   | 6 +++++-
 .../recipes-kernel/linux/linux-yocto/no-fsl-ifc-nand.cfg    | 1 +
 meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend        | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/files/no-fsl-ifc-nand.cfg
 create mode 100644 meta-arm/recipes-kernel/linux/linux-yocto/no-fsl-ifc-nand.cfg

diff --git a/meta-arm-bsp/recipes-kernel/linux/files/no-fsl-ifc-nand.cfg b/meta-arm-bsp/recipes-kernel/linux/files/no-fsl-ifc-nand.cfg
new file mode 100644
index 000000000000..85f956a12e71
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/files/no-fsl-ifc-nand.cfg
@@ -0,0 +1 @@
+CONFIG_MTD_NAND_FSL_IFC=n
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index fc7df03aa436..eee26a384c35 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -91,7 +91,10 @@ COMPATIBLE_MACHINE:juno = "juno"
 KBUILD_DEFCONFIG:juno = "defconfig"
 KCONFIG_MODE:juno = "--alldefconfig"
 FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}"
-SRC_URI:append:juno = " file://juno-dts-mhu-doorbell.patch"
+SRC_URI:append:juno = " \
+    file://juno-dts-mhu-doorbell.patch \
+    file://no-fsl-ifc-nand.cfg \
+    "
 
 #
 # Musca B1/S2 can't run Linux
@@ -116,6 +119,7 @@ SRC_URI:append:n1sdp = " \
     file://enable-realtek-R8169.cfg \
     file://enable-usb_conn_gpio.cfg \
     file://usb_xhci_pci_renesas.cfg \
+    file://no-fsl-ifc-nand.cfg \
     "
 # Since we use the intree defconfig and the preempt-rt turns off some configs
 # do_kernel_configcheck will display warnings. So, lets disable it.
diff --git a/meta-arm/recipes-kernel/linux/linux-yocto/no-fsl-ifc-nand.cfg b/meta-arm/recipes-kernel/linux/linux-yocto/no-fsl-ifc-nand.cfg
new file mode 100644
index 000000000000..85f956a12e71
--- /dev/null
+++ b/meta-arm/recipes-kernel/linux/linux-yocto/no-fsl-ifc-nand.cfg
@@ -0,0 +1 @@
+CONFIG_MTD_NAND_FSL_IFC=n
diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
index 53ff4ac804ae..d827561c0df2 100644
--- a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -4,6 +4,7 @@ COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
 FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
 SRC_URI:append:generic-arm64 = " \
     file://tcpci.cfg \
+    file://no-fsl-ifc-nand.cfg \
     "
 
 FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}"
-- 
2.39.5 (Apple Git-154)
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.