Merge pull request #2449 from noreng-br/topic/kernel-modules-update

kernel-modules upgrade

4 files changed, 34 insertions, 29 deletions

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb
index 8670443db..dc0f2886f 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb
@@ -7,12 +7,13 @@ allowing flexibility to use a newer graphics release with an older kernel."
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI = "${LINUX_IMX_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${S}/src \
+SRC_URI = "${LINUX_IMX_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${BP}/src \
            file://Add-makefile.patch"
+
 LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.20-2.0.0"
-SRCREV = "d53b3fa8a69bef5ead825e81aa62dbdd08e1409c"
+LOCALVERSION = "-lts-${SRCBRANCH}"
+SRCREV = "807e28f65f46b131a698a4c62e2cc0b6b4682731"
 
 S = "${UNPACKDIR}/${BP}"
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb
deleted file mode 100644
index 058d9e0d8..000000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2020-2025 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.12.y_2.0.0"
-SRCREV = "dc686fbb8b5b2f4cbc58d83756f65ad970b03ac2"
-
-
-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-isp-vvcam_4.2.2.25.4.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb
new file mode 100644
index 000000000..2da42a7dc
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb
@@ -0,0 +1,23 @@
+# 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-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 2341ab0c9..48f1ad724 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -2,20 +2,24 @@ SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/610/612"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
 
-# For backwards compatibility
 PROVIDES += "kernel-module-nxp89xx"
 RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 
-SRCBRANCH = "lf-6.12.20_2.0.0"
+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 = "7a8beaa1605cb0870dc7ba3312c76df91cb0d6cf"
+SRCREV = "84ca65c9ff935d7f2999af100a82531c22c65234"
 
 inherit module
 
 EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}"
+
+KERNEL_MODULE_AUTOLOAD += "moal"