| Message ID | 20241021152152.73664-2-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [scarthgap,1/2] arm-bsp/fvp-base: Get 6.10 kernel working | expand |
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 e2b261f515ff..82966db761bd 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -78,6 +78,9 @@ SRC_URI:append:fvp-base = " \ # COMPATIBLE_MACHINE:juno = "juno" FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}" +SRC_URI:append:juno = " \ + file://no-fsl-ifc-nand.cfg \ + " # # Musca B1/S2 can't run Linux @@ -104,6 +107,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.
Linux stable kernel v6.6.44 added commit c22649e217457d732a51112aaa8721a0e79e2c30, 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-6.6.y&id=c22649e217457d732a51112aaa8721a0e79e2c30 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 <jon.mason@arm.com> --- meta-arm-bsp/recipes-kernel/linux/files/no-fsl-ifc-nand.cfg | 1 + meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 meta-arm-bsp/recipes-kernel/linux/files/no-fsl-ifc-nand.cfg