16 files changed, 187 insertions, 155 deletions

diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index 94b30c04e..df4ac5fbf 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -17,21 +17,21 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}"
 do_compile:prepend() {
         if [ "${SCMVERSION}" = "y" ]; then
                 # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
-                else
-                        hash=${SRCREV}
-                fi
-                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
-                printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion
-        else
+                if [ "${SRCREV}" = "INVALID" ]; then
+                        hash=${SRCREV_machine}
+                else
+                        hash=${SRCREV}
+                fi
+                if [ "$hash" = "AUTOINC" ]; then
+                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+                else
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+                fi
+                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
+                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
+        else
                 printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
                 printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
         fi
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch
deleted file mode 100644
index a576f917a..000000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-libluajit is having symbols that can't be
-resolved the reloc cannot accommodate an offset greater than 24 bits.
-
-Looking at libluajit with readelf -r, you see a bunch of entries that look like:
-        000082f0  00003c0a R_PPC_REL24       00000000   sqrt + 0
-
-These should not occur when the code is compiled and linked with -fPIC.
-
-It turns out that libluajit *is* compiled and linked with -fPIC, however...
-There is one assembler file called lj_vm.s which is generated during the build.
-This file is missing the `@plt' qualifier from external references.
-
-This file is generated by a program called buildvm.  This in turn uses tables
-in a file called buildvm_arch.h which is generated by dynasm.lua.
-
-Index: LuaJIT-2.0.1/src/host/buildvm.c
-===================================================================
---- LuaJIT-2.0.1.orig/src/host/buildvm.c        2013-02-19 12:15:00.000000000 -0800
-+++ LuaJIT-2.0.1/src/host/buildvm.c     2013-05-14 20:26:05.933444512 -0700
-@@ -107,12 +107,14 @@
- #endif
-   sprintf(name, "%s%s%s", symprefix, prefix, suffix);
-   p = strchr(name, '@');
-+#if 0
-   if (p) {
-     if (!LJ_64 && (ctx->mode == BUILD_coffasm || ctx->mode == BUILD_peobj))
-       name[0] = '@';
-     else
-       *p = '\0';
-   }
-+#endif
-   p = (char *)malloc(strlen(name)+1);  /* MSVC doesn't like strdup. */
-   strcpy(p, name);
-   return p;
-Index: LuaJIT-2.0.1/src/vm_ppcspe.dasc
-===================================================================
---- LuaJIT-2.0.1.orig/src/vm_ppcspe.dasc        2013-02-19 12:15:00.000000000 -0800
-+++ LuaJIT-2.0.1/src/vm_ppcspe.dasc     2013-05-14 20:26:05.937444512 -0700
-@@ -1390,7 +1390,7 @@
-   |  checknum CARG2
-   |   evmergehi CARG1, CARG2, CARG2
-   |  checkfail ->fff_fallback
--  |  bl extern func
-+  |  bl extern func@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |.endmacro
-@@ -1405,7 +1405,7 @@
-   |  checknum CARG1
-   |   evmergehi CARG3, CARG4, CARG4
-   |  checkanyfail ->fff_fallback
--  |  bl extern func
-+  |  bl extern func@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |.endmacro
-@@ -1437,7 +1437,7 @@
-   |  checknum CARG2
-   |   evmergehi CARG1, CARG2, CARG2
-   |  checkfail ->fff_fallback
--  |  bl extern log
-+  |  bl extern log@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |
-@@ -1471,7 +1471,7 @@
-   |  checknum CARG1
-   |  checkanyfail ->fff_fallback
-   |  efdctsi CARG3, CARG4
--  |  bl extern ldexp
-+  |  bl extern ldexp@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |
-@@ -1484,7 +1484,7 @@
-   |  checkfail ->fff_fallback
-   |  la CARG3, DISPATCH_GL(tmptv)(DISPATCH)
-   |   lwz PC, FRAME_PC(BASE)
--  |  bl extern frexp
-+  |  bl extern frexp@plt
-   |   lwz TMP1, DISPATCH_GL(tmptv)(DISPATCH)
-   |  evmergelo CRET1, CRET1, CRET2
-   |   efdcfsi CRET2, TMP1
-@@ -1503,7 +1503,7 @@
-   |  checkfail ->fff_fallback
-   |  la CARG3, -8(BASE)
-   |   lwz PC, FRAME_PC(BASE)
--  |  bl extern modf
-+  |  bl extern modf@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |   la RA, -8(BASE)
-   |  evstdd CRET1, 0(BASE)
-@@ -2399,7 +2399,7 @@
-     |  checknum CARG1
-     |   evmergehi CARG3, CARG4, CARG4
-     |  checkanyfail ->vmeta_arith_vv
--    |  bl extern pow
-+    |  bl extern pow@plt
-     |  evmergelo CRET2, CRET1, CRET2
-     |  evstddx CRET2, BASE, RA
-     |  ins_next
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend
deleted file mode 100644
index d07f8ae14..000000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch "
-
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
index d28b23821..c425173c0 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
@@ -7,11 +7,11 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a"
 
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "2afa15e77f0b58eade42b4f59c9215339efcca66"
+SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCREV = "7e038c6afba3118bcee91608764ac3c633bce0c4"
 
 S = "${WORKDIR}/git"
 
@@ -150,6 +150,7 @@ FILES:${PN}-nxpiw612-sdio = " \
     ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \
+    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_v1.bin.se \
 "
 RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index d06ccfa10..9c9db88bc 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -13,7 +13,7 @@ PE = "1"
 PV = "5.9+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.6.23_2.0.0"
 SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 7792b27bd..631217daf 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -41,6 +41,9 @@ do_compile[depends] += " \
 
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
 
+OEI_ENABLE = "${@bb.utils.contains('DEPENDS', 'imx-oei', 'YES', 'NO', d)}"
+OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
+
 ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
@@ -60,6 +63,7 @@ BOOT_STAGING:mx8m-generic-bsp  = "${S}/iMX8M"
 BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX"
 BOOT_STAGING:mx91p-generic-bsp   = "${S}/iMX91"
 BOOT_STAGING:mx93-generic-bsp   = "${S}/iMX93"
+BOOT_STAGING:mx95-generic-bsp  = "${S}/iMX95"
 
 SOC_FAMILY                    = "INVALID"
 SOC_FAMILY:mx8-generic-bsp    = "mx8"
@@ -68,9 +72,19 @@ SOC_FAMILY:mx8x-generic-bsp   = "mx8x"
 SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
 SOC_FAMILY:mx91p-generic-bsp  = "mx93"
 SOC_FAMILY:mx93-generic-bsp   = "mx93"
+SOC_FAMILY:mx95-generic-bsp   = "mx95"
 
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 
+MKIMAGE_EXTRA_ARGS ?= ""
+MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
+    OEI=${OEI_ENABLE} \
+    LPDDR_TYPE=${DDR_TYPE} \
+    ${@bb.utils.contains('SYSTEM_MANAGER_CONFIG', 'mx95alt', 'MSEL=1', '', d)}"
+MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \
+    ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
+    QSPI_HEADER=./scripts/fspi_header_133"
+
 do_uboot_assemble_fitimage:prepend:imx-generic-bsp() {
     for config in ${UBOOT_MACHINE}; do
         mkdir -p ${B}/${config}
@@ -156,13 +170,30 @@ compile_mx93() {
     fi
 }
 
+compile_mx95() {
+    bbnote i.MX 95 boot binary build
+    compile_mx93
+
+    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
+       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
+}
+
 do_compile() {
     # mkimage for i.MX8
     # Copy TEE binary to SoC target folder to mkimage
     if ${DEPLOY_OPTEE}; then
         cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}
+        if ${DEPLOY_OPTEE_STMM}; then
+            # Copy tee.bin to tee.bin-stmm
+            cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}/tee.bin-stmm
+        fi
+    fi
+    # Copy OEI firmware to SoC target folder to mkimage
+    if [ "${OEI_ENABLE}" = "YES" ]; then
+        cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
     fi
-   for type in ${UBOOT_CONFIG}; do
+
+    for type in ${UBOOT_CONFIG}; do
         if [ "${@d.getVarFlags('UBOOT_DTB_NAME')}" = "None" ]; then
             UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}"
         else
@@ -193,9 +224,16 @@ do_compile() {
                         # Special target build for i.MX 8DXL with V2X off
                         bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}"
                         make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME_EXTRA} flash_linux_m4
+                    elif [[ $target == *sttm_capsule ]]; then
+                        # target for flash_evk_stmm_capsule or
+                        # flash_singleboot_stmm_capsule
+                        cp ${RECIPE_SYSROOT_NATIVE}/${bindir}/mkeficapsule ${BOOT_STAGING}
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${target}"
+                        cp ${DEPLOY_DIR_IMAGE}/CRT.* ${BOOT_STAGING}
+                        make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target}
                     else
-                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${target}"
-                        make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME_EXTRA} ${target}
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} ${target}"
+                        make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} dtbs=${UBOOT_DTB_NAME} ${target}
                     fi
                     if [ -e "${BOOT_STAGING}/flash.bin" ]; then
                         cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target}
@@ -294,6 +332,12 @@ deploy_mx93() {
     fi
 }
 
+deploy_mx95() {
+    deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
+                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
+}
+
 do_deploy() {
     deploy_${SOC_FAMILY}
 
@@ -301,6 +345,12 @@ do_deploy() {
     if ${DEPLOY_OPTEE}; then
        install -m 0644 ${DEPLOY_DIR_IMAGE}/tee.bin ${DEPLOYDIR}/${BOOT_TOOLS}
     fi
+
+    # copy oei to deploy path
+    if [ "${OEI_ENABLE}" = "YES" ]; then
+        install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
+    fi
+
     # copy makefile (soc.mak) for reference
     install -m 0644 ${BOOT_STAGING}/soc.mak                  ${DEPLOYDIR}/${BOOT_TOOLS}
 
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index fb3df750a..9b03d3924 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,12 +1,12 @@
-# Copyright 2017-2022 NXP
+# Copyright 2017-2023 NXP
 
 DEPENDS = "zlib-native openssl-native"
 
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "cbb99377cc2bb8f7cf213794c030e1c60423ef1f"
+SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCREV = "ca5d6b2d3fd9ab15825b97f7ef6f1ce9a8644966"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
new file mode 100644
index 000000000..a853a803a
--- /dev/null
+++ b/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
@@ -0,0 +1,57 @@
+SUMMARY = "i.MX Optional Execution Image"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "gcc-arm-none-eabi-native"
+
+SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}"
+IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
+SRCBRANCH = "master"
+SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678"
+
+S = "${WORKDIR}/git"
+
+inherit deploy
+
+OEI_CONFIGS ?= "UNDEFINED"
+OEI_CORE    ?= "UNDEFINED"
+OEI_SOC     ?= "UNDEFINED"
+OEI_BOARD   ?= "UNDEFINED"
+
+LDFLAGS[unexport] = "1"
+
+EXTRA_OEMAKE = "\
+    board=${OEI_BOARD} \
+    DEBUG=1 \
+    OEI_CROSS_COMPILE=arm-none-eabi-"
+
+do_configure() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake clean oei=$oei_config
+    done
+}
+
+do_compile() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake oei=$oei_config
+    done
+}
+
+do_install() {
+    install -d ${D}/firmware
+    for oei_config in ${OEI_CONFIGS}; do
+        install -m 0644 ${B}/build/${OEI_BOARD}/$oei_config/oei-*.bin ${D}/firmware
+    done
+}
+
+addtask deploy after do_install
+do_deploy() {
+    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
+}
+
+FILES:${PN} = "/firmware"
+SYSROOT_DIRS += "/firmware"
+
+COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb
index f7dadea57..14b15da29 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb
@@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO firmware"
 DESCRIPTION = "Firmware for i.MX Security Controller Subsystem"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "b722a534c4d3cc90270e05eaa812514d"
-SRC_URI[sha256sum] = "c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df"
+SRC_URI[md5sum] = "d05d6b15ad9ad0df141e1fc736f4a622"
+SRC_URI[sha256sum] = "9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7"
 
 
 do_compile[noexec] = "1"
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 48e9cc3bc..453fdd48c 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://../../LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
 
 # For backwards compatibility
 PROVIDES += "kernel-module-nxp89xx"
@@ -8,12 +8,12 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.6.23_2.0.0"
 MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
-SRCREV = "a84df583155bad2a396a937056805550bdf655ab"
+SRCREV = "88372772badbf30152b3ad12ae251dc567095cab"
 
-S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
+S = "${WORKDIR}/git"
 
 inherit module
 
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb b/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb
index 0a2c71e76..761345ce7 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb
@@ -5,14 +5,14 @@
 DESCRIPTION = "Freescale Multimedia codec libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 # Backward compatibility
 PROVIDES += "libfslcodec"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "7ae1615aad2c0456b9be2ab804a6267e"
-SRC_URI[sha256sum] = "9facb3541903b4a6c6baa906f8c2c6cc01fc8c7b82a726c8da6d3681d4ed720b"
+SRC_URI[md5sum] = "2208aa871e51aacf1910c59c24694572"
+SRC_URI[sha256sum] = "1a41a3cad9e0f4baa904fcec896105d3474e18d13f169dad1172d5691fc11c9a"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
index bc73bd9f9..87cc0b302 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
@@ -2,14 +2,14 @@
 
 DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "32251bc952ca7b9a4b12fadb9328a8c1"
-SRC_URI[sha256sum] = "0baa82410a77c68e39aaa987d91b41c94255d62294fa2f5a399169f3068862cc"
+SRC_URI[md5sum] = "4250b61f23f49de9500ea8208f6e2be9"
+SRC_URI[sha256sum] = "fa30f3e1b13e570d7c6f0a5f335c11fc3c6336a266fd3a4941e27c4c2a5b13d3"
 
 EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp"
 EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb
index 60761e6e1..d260c8167 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb
@@ -2,15 +2,15 @@
 
 DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 
 inherit fsl-eula-unpack autotools pkgconfig
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "199f88716f289e93e0954fa6475a3cbc"
-SRC_URI[sha256sum] = "83eaef592de33b4d5e8fae63d798cc955bf3c414911c87afeb65a20af01fb0b6"
+SRC_URI[md5sum] = "6699e619f941cfa2e2b99cc2a99b7575"
+SRC_URI[sha256sum] = "5d42c8f39fb36bcc48e9f0c4caffd125b89c257fa8eccb3b61608bc690a16462"
 
 EXTRA_OECONF = " \
     -datadir=${base_libdir}/firmware \
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb
index 4e580085f..4bbf6dfb6 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -14,8 +14,8 @@ RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "9bca484287f5592b86ed10c1761a3fcc"
-SRC_URI[sha256sum] = "b25267eefb4618b2ba8d6aba46a5b4e09621a44115036fc896e0777006472043"
+SRC_URI[md5sum] = "700b4cf3ba547dc740a064787f528af0"
+SRC_URI[sha256sum] = "2f0fc3955f824936c359b3cb738549213823b0c366b2362bba593058da745677"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch
new file mode 100644
index 000000000..ab8b50de4
--- /dev/null
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch
@@ -0,0 +1,31 @@
+From a57daf8f58cf69be06de8ebc9eab3a3077143760 Mon Sep 17 00:00:00 2001
+From: Hiago De Franco <hiago.franco@toradex.com>
+Date: Fri, 26 Jul 2024 14:43:55 -0300
+Subject: [PATCH] vpu_wrapper_hantro_VCencoder: add sys/time.h for gettimeofday
+
+Fixes:
+| ../git/vpu_wrapper_hantro_VCencoder.c:1965:5: error: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration]
+|  1965 |     gettimeofday (&pObj->tvBegin, NULL);
+|       |     ^~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/nxp-imx/imx-vpuwrap/pull/2]
+Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
+---
+ vpu_wrapper_hantro_VCencoder.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/vpu_wrapper_hantro_VCencoder.c b/vpu_wrapper_hantro_VCencoder.c
+index efae31a77ca4..6185cfc067d1 100755
+--- a/vpu_wrapper_hantro_VCencoder.c
++++ b/vpu_wrapper_hantro_VCencoder.c
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/time.h>
+ #include <time.h>
+ #include <math.h>
+ #include <fcntl.h>
+--
+2.39.2
+
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index bae9c928b..f7a8e3521 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
@@ -13,9 +13,10 @@ DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 SRC_URI = " \
     git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH} \
     file://0001-vpu_wrapper_hantro_encoder-add-sys-time.h-for-gettim.patch \
+    file://0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch \
 "
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
-SRCREV = "f974cecdb00b4a214e4b5229f2279e772ee43306"
+SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCREV = "73093da30dc4053c9f69813a6447091bfca5429b"
 
 S = "${WORKDIR}/git"