12 files changed, 85 insertions, 46 deletions

diff --git a/LICENSE b/LICENSE
index 42e980c92..21163af1f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -110,8 +110,9 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb: LICENSE = "GPL-2.0-or-later"
 ./recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb: LICENSE = "GPL-2.0-only"
-./recipes-kernel/linux/linux-imx-headers_6.12.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/linux/linux-imx-headers_6.18.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/linux/linux-imx.inc: LICENSE = "GPL-2.0-only"
+./recipes-kernel/linux/linux-imx_6.18.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/linux/linux-qoriq.inc: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/skmm-host/skmm-host_git.bb: LICENSE = "BSD & GPL-2.0-or-later"
 ./recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb: LICENSE = "Apache-2.0"
diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf
index 467ca8630..afb3ca29d 100644
--- a/conf/machine/imx8mm-ddr4-evk.conf
+++ b/conf/machine/imx8mm-ddr4-evk.conf
@@ -8,6 +8,7 @@ require include/imx8mm-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191-cmd-ram.dtb \
diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf
index e21d8bf89..ae81a92d4 100644
--- a/conf/machine/imx8mm-lpddr4-evk.conf
+++ b/conf/machine/imx8mm-lpddr4-evk.conf
@@ -20,6 +20,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524.dtb \
diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf
index 7a796d38d..7b3682217 100644
--- a/conf/machine/imx8mn-ddr4-evk.conf
+++ b/conf/machine/imx8mn-ddr4-evk.conf
@@ -8,6 +8,7 @@ require include/imx8mn-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 17adba763..8a80cfd61 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -34,8 +34,9 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-os08a20-ov5640.dtb \
     freescale/imx8mp-evk-ov2775.dtb \
     freescale/imx8mp-evk-ov2775-ov5640.dtb \
-    freescale/imx8mp-evk-pcie-ep.dtb \
     freescale/imx8mp-evk-revA3-8mic-revE.dtb \
+    freescale/imx8mp-evk-revb4-rm692c9.dtb \
+    freescale/imx8mp-evk-rm692c9.dtb \
     freescale/imx8mp-evk-rm67191.dtb \
     freescale/imx8mp-evk-rm67199.dtb \
     freescale/imx8mp-evk-root.dtb \
@@ -43,7 +44,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-sof-pdm.dtb \
     freescale/imx8mp-evk-sof-wm8960.dtb \
     freescale/imx8mp-evk-spdif-lb.dtb \
-    freescale/imx8mp-evk-usdhc1-m2.dtb \
     freescale/imx8mp-evk-8mic-swpdm.dtb \
 "
 
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 7b347bf10..9e5c27b43 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -28,13 +28,15 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
         freescale/imx8mq-evk-dcss-adv7535.dtb \
         freescale/imx8mq-evk-dcss-rm67191.dtb \
         freescale/imx8mq-evk-dcss-rm67199.dtb \
+        freescale/imx8mq-evk-dcss-rm692c9.dtb \
         freescale/imx8mq-evk-dp.dtb \
         freescale/imx8mq-evk-dual-display.dtb \
         freescale/imx8mq-evk-inmate.dtb \
         freescale/imx8mq-evk-lcdif-adv7535.dtb \
         freescale/imx8mq-evk-lcdif-rm67191.dtb \
         freescale/imx8mq-evk-lcdif-rm67199.dtb \
-        freescale/imx8mq-evk-pcie-ep.dtb \
+        freescale/imx8mq-evk-lcdif-rm692c9.dtb \
+        freescale/imx8mq-evk-pcie1-ep.dtb \
         freescale/imx8mq-evk-pcie1-m2.dtb \
         freescale/imx8mq-evk-pdm.dtb \
         freescale/imx8mq-evk-root.dtb \
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index a7e52d54d..bb65ae13e 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -42,7 +42,6 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-hdmi-rx.dtbo \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/imx8qm-mek-pcie-ep.dtb \
     freescale/imx8qm-mek-rpmsg.dtb \
     freescale/imx8qm-mek-sof.dtb \
     freescale/imx8qm-mek-sof-cs42888.dtb \
@@ -52,6 +51,8 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-max9286-csi0.dtb \
     freescale/imx8qm-mek-max9286-csi1.dtb \
     freescale/imx8qm-mek-max9286-dual.dtb \
+    freescale/imx8qm-mek-pcie0-ep.dtb \
+    freescale/imx8qm-mek-pcie0-ep-rpmsg.dtb \
     freescale/imx8qm-mek-revd-ca53.dtb \
     freescale/imx8qm-mek-revd-ca72.dtb \
     freescale/imx8qm-mek-revd-dsi-rm67191.dtb \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 8da1177bb..e6eb2109f 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -29,10 +29,10 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-max9286-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-cpi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-cpi-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8qxp_mek"
diff --git a/conf/machine/include/imx8dxl-lpddr4-evk.inc b/conf/machine/include/imx8dxl-lpddr4-evk.inc
index b3b906ec7..c19f09eb2 100644
--- a/conf/machine/include/imx8dxl-lpddr4-evk.inc
+++ b/conf/machine/include/imx8dxl-lpddr4-evk.inc
@@ -8,6 +8,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep-rpmsg.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8dxl_evk"
diff --git a/recipes-kernel/linux/linux-imx-headers_6.12.bb b/recipes-kernel/linux/linux-imx-headers_6.18.bb
index c063a7ae1..c6a3786c9 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.12.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.18.bb
@@ -7,12 +7,13 @@ New headers are installed in ${includedir}/imx."
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-SRC_URI = " \
-    git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
-"
-SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.49-2.2.0"
-SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
+SRC_URI = "${LINUX_IMX_SRC}"
+LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-6.18.y"
+LOCALVERSION = "-lts-${SRCBRANCH}"
+KBRANCH = "${SRCBRANCH}"
+SRCREV = "f49f45233f7b10006ce7e9c826ee882bb14ac8b5"
+
 
 do_configure[noexec] = "1"
 
diff --git a/recipes-kernel/linux/linux-imx_6.12.bb b/recipes-kernel/linux/linux-imx_6.12.bb
deleted file mode 100644
index c34f3f86b..000000000
--- a/recipes-kernel/linux/linux-imx_6.12.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2013-2016 (C) Freescale Semiconductor
-# Copyright 2017-2026 (C) NXP
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-#
-# SPDX-License-Identifier: MIT
-#
-
-SUMMARY = "Linux Kernel provided and supported by NXP"
-DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
-i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
-
-require recipes-kernel/linux/linux-imx.inc
-
-SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.49-2.2.0"
-SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
-
-# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
-# required by kernel-yocto.bbclass.
-#
-# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
-# should be updated once patchlevel is merged.
-LINUX_VERSION = "6.12.49"
-
-KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
-KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
-KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig"
-KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig"
-
-DEFAULT_PREFERENCE = "1"
-
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-kernel/linux/linux-imx_6.18.bb b/recipes-kernel/linux/linux-imx_6.18.bb
new file mode 100644
index 000000000..5010f66c7
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx_6.18.bb
@@ -0,0 +1,63 @@
+# Copyright 2013-2016 Freescale Semiconductor
+# Copyright 2017-2026 NXP
+# Copyright 2018 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# SPDX-License-Identifier: MIT
+#
+
+SUMMARY = "Linux Kernel provided and supported by NXP"
+DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
+i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
+
+require recipes-kernel/linux/linux-imx.inc
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+DEPENDS += "coreutils-native"
+
+SRC_URI = "${LINUX_IMX_SRC}"
+LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-6.18.y"
+KBRANCH = "${SRCBRANCH}"
+LOCALVERSION = "-1.0.0"
+SRCREV = "f49f45233f7b10006ce7e9c826ee882bb14ac8b5"
+
+# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
+# required by kernel-yocto.bbclass.
+#
+# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
+# should be updated once patchlevel is merged.
+LINUX_VERSION = "6.18.2"
+
+KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
+KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
+KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig"
+KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig"
+
+DEFAULT_PREFERENCE = "1"
+
+python __anonymous () {
+    import bb
+    # Fail fast if DELTA_KERNEL_DEFCONFIG is present in the datastore (even if empty)
+    if "DELTA_KERNEL_DEFCONFIG" in d.keys():
+        val = d.getVar("DELTA_KERNEL_DEFCONFIG", expand=False)
+        bb.error(f"Detected deprecated/unsupported variable 'DELTA_KERNEL_DEFCONFIG' (value: '{val}').")
+        bb.fatal("Please remove 'DELTA_KERNEL_DEFCONFIG' and use supported kernel configuration methods, "
+                 "e.g., configuration fragments via kernel-yocto or a maintained defconfig.")
+}
+
+do_deploy:append() {
+    if [ ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} ]; then
+        baseName=${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_NAME}
+        gzip -c ${DEPLOYDIR}/$baseName${KERNEL_IMAGE_BIN_EXT} > \
+            ${DEPLOYDIR}/$baseName${KERNEL_IMAGE_BIN_EXT}.gz
+        ln -sf $baseName${KERNEL_IMAGE_BIN_EXT}.gz $deployDir/${KERNEL_IMAGETYPE}.gz
+        # FIXME: For now, the CRRM kernel is just a copy of the regular kernel
+        ln -sf $baseName${KERNEL_IMAGE_BIN_EXT}    $deployDir/${KERNEL_IMAGETYPE}_crrm
+        ln -sf $baseName${KERNEL_IMAGE_BIN_EXT}.gz $deployDir/${KERNEL_IMAGETYPE}_crrm.gz
+    fi
+}
+
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"