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 00000000..85f956a1
--- /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 fc7df03a..eee26a38 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 00000000..85f956a1
--- /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 53ff4ac8..d827561c 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}"