4 files changed, 25 insertions, 60 deletions

diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb
deleted file mode 100644
index 2da42a7dc..000000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020-2023 NXP
-
-DESCRIPTION = "Kernel loadable module for ISP"
-LICENSE = "GPL-2.0-only"
-
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
-ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
-SRCBRANCH = "lf-6.12.y_2.2.0"
-SRCREV = "ad057a15dd57e053e3596ae83b45ea96835acd3e"
-
-S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
-
-inherit module
-
-MODULES_MODULE_SYMVERS_LOCATION = "dwe"
-
-DEBUG_PREFIX_MAP:prepend = " \
-    -fmacro-prefix-map=${WORKDIR}/sources=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
-    -fdebug-prefix-map=${WORKDIR}/sources=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
-
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
new file mode 100644
index 000000000..b4f5cdf95
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
@@ -0,0 +1,22 @@
+# Copyright 2020-2026 NXP
+
+DESCRIPTION = "Kernel loadable module for ISP"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
+
+SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
+ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
+SRCBRANCH = "lf-6.18.y_1.0.0"
+SRCREV = "5484bc99a258562c3893808736dd67af22ac355e"
+
+S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
+
+inherit module
+
+MODULES_MODULE_SYMVERS_LOCATION = "dwe"
+
+DEBUG_PREFIX_MAP:prepend = " \
+    -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+    -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
+
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
deleted file mode 100644
index 72e75fd57..000000000
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f6079560bd0010a7f34bd18fec8fab4df65b22ea Mon Sep 17 00:00:00 2001
-From: Vitor Soares <vitor.soares@toradex.com>
-Date: Wed, 30 Apr 2025 15:12:06 +0100
-Subject: [PATCH] mlinux: moal_main: lower PRINTM_MMSG() log level to KERN_INFO
-
-Currently, the PRINTM_MMSG macro uses KERN_ALERT for printing messages.
-KERN_ALERT is intended for critical conditions requiring immediate
-attention (e.g., hardware failure), and using it for normal debug output
-is misleading and can clutter system logs.
-
-This patch lowers the log level to KERN_INFO, which is more appropriate
-for informational messages that are not indicative of system-critical
-failures.
-
-Upstream-Status: Inappropriate [upstream not accepting patches]
-Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
----
- mlinux/moal_main.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mlinux/moal_main.h b/mlinux/moal_main.h
-index 4328652..27121e0 100644
---- a/mlinux/moal_main.h
-+++ b/mlinux/moal_main.h
-@@ -3529,7 +3529,7 @@ extern t_u32 drvdbg;
-        do {                                                                   \
-                woal_print(MMSG, msg);                                         \
-                if (drvdbg & MMSG)                                             \
--                       printk(KERN_ALERT msg);                                \
-+                       printk(KERN_INFO msg);                                \
-        } while (0)
- 
- static inline void woal_print(t_u32 level, char *fmt, ...)
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 48f1ad724..073a62ff9 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -10,13 +10,12 @@ RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 KERNEL_MODULE_PROBECONF += "moal"
 module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf"
 
-SRCBRANCH = "lf-6.12.49_2.2.0"
-MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = " \
     ${MRVL_SRC};branch=${SRCBRANCH} \
-    file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
 "
-SRCREV = "84ca65c9ff935d7f2999af100a82531c22c65234"
+MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "a5fe4e194bf99315e349d81d77d6dfacec70757a"
 
 inherit module