33 files changed, 159 insertions, 219 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b4f853888..baca3fc42 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -597,12 +597,12 @@ PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
 # Use i.MX libdrm Version
 PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx"
 
-PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.261.1.imx"
-PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx"
+PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.275.0.imx"
+PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
 
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "4.2.0.imx"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
deleted file mode 100644
index b77fbc838..000000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-DEPENDS:append:imxvpu = " imx-vpuwrap"
-
-# Additional imx code and patches are included in the chromium-imx git repository.
-# The code below fetches this repository, copies the extra source over to the main
-# chromium source directory, and applies the patches.
-
-CHROMIUM_IMX_BRANCH ?= "master"
-CHROMIUM_IMX_SRCREV ?= "HEAD"
-CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git"
-
-PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches"
-
-CHROMIUM_IMX_COMMON_PATCHES ?= " "
-CHROMIUM_IMX_VPU_PATCHES ?= " "
-CHROMIUM_IMX_WAYLAND_PATCHES ?= " "
-
-SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https"
-
-do_unpack[postfuncs] += "copy_chromium_imx_files"
-# using =+ instead of += to make sure add_chromium_imx_patches is
-# executed before add_ozone_wayland_patches in the main recipe;
-# this is necessary because add_chromium_imx_patches appends
-# patches to the OZONE_WAYLAND_EXTRA_PATCHES variable
-do_patch[prefuncs] =+ "add_chromium_imx_patches"
-
-# * Lost context problems are not known to happen with Vivante GPUs,
-#   so it is safe to use ignore-lost-context
-# * Proprietary codecs need to be enabled for h.264 and MP4 support
-PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs"
-
-copy_chromium_imx_files() {
-        # sources in src/ are already organized in a manner
-        # that matches the subdirectories in the chromium
-        # source directory; just copy over the files in src/
-        cp -r ${WORKDIR}/chromium-imx-git/src/* ${S}/
-}
-
-python add_chromium_imx_patches() {
-    d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_COMMON_PATCHES', 1))
-    d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_VPU_PATCHES', 1))
-    d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1))
-}
-
-COMPATIBLE_MACHINE = "(mx6-nxp-bsp)"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
deleted file mode 100644
index 23a8fff9c..000000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream-Status: Pending
-diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h
---- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500
-+++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h     2016-05-27 11:49:53.000000000 -0500
-@@ -36,7 +36,7 @@
- extern "C" {
- #endif
- 
--#include <va/va.h>
-+#include <libva/va/va.h>
- 
- /**
-  * \defgroup api_dec_jpeg JPEG decoding API
-diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h chromium-48.0.2548.0/third_party/libva/va/va.h
---- chromium-48.0.2548.0_org/third_party/libva/va/va.h  2016-05-27 11:45:31.248306710 -0500
-+++ chromium-48.0.2548.0/third_party/libva/va/va.h      2016-05-27 11:49:16.000000000 -0500
-@@ -80,7 +80,7 @@
- 
- #include <stddef.h>
- #include <stdint.h>
--#include <va/va_version.h>
-+#include <libva/va/va_version.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -2836,16 +2836,16 @@
-  */
- #define VA_PICTURE_HEVC_RPS_LT_CURR             0x00000040
- 
--#include <va/va_dec_hevc.h>
--#include <va/va_dec_jpeg.h>
--#include <va/va_dec_vp8.h>
--#include <va/va_dec_vp9.h>
--#include <va/va_enc_hevc.h>
--#include <va/va_enc_h264.h>
--#include <va/va_enc_jpeg.h>
--#include <va/va_enc_mpeg2.h>
--#include <va/va_enc_vp8.h>
--#include <va/va_vpp.h>
-+#include <libva/va/va_dec_hevc.h>
-+#include <libva/va/va_dec_jpeg.h>
-+#include <libva/va/va_dec_vp8.h>
-+#include <libva/va/va_dec_vp9.h>
-+#include <libva/va/va_enc_hevc.h>
-+#include <libva/va/va_enc_h264.h>
-+#include <libva/va/va_enc_jpeg.h>
-+#include <libva/va/va_enc_mpeg2.h>
-+#include <libva/va/va_enc_vp8.h>
-+#include <libva/va/va_vpp.h>
- 
- /**@}*/
- 
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 9c9db88bc..348d717a7 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.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.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 3c027044d..63857fa65 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -104,7 +104,9 @@ compile_mx8m() {
         cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \
                                                              ${BOOT_STAGING}
     fi
-    ln -sf ${UBOOT_DTB_NAME_EXTRA}                           ${BOOT_STAGING}/${UBOOT_DTB_NAME}
+    if [ "${UBOOT_DTB_NAME_EXTRA}" != "${UBOOT_DTB_NAME}" ] ; then
+        ln -sf ${UBOOT_DTB_NAME_EXTRA}                       ${BOOT_STAGING}/${UBOOT_DTB_NAME}
+    fi
 
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
                                                              ${BOOT_STAGING}/u-boot-nodtb.bin
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
index 945f0879f..598a8fc20 100644
--- a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
@@ -4,11 +4,12 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
-SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb"
+SRCREV = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
index 690428829..05c6de1b5 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
@@ -7,11 +7,12 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0"
+SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
index 01eb14b9f..aacec8cab 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
 
-SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50"
+SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40"
 
 S = "${WORKDIR}/git"
 
@@ -21,7 +21,8 @@ FILES:${PN} += "${datadir}/vulkan"
 RDEPENDS:${PN} += "python3-core"
 
 # These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
index 01cbeafa3..7caed6720 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https"
-SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https"
+SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229"
 
 S = "${WORKDIR}/git"
 
@@ -36,7 +36,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
 RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
 
 # These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
index 7a7edc9eb..f86912c90 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
-SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1"
+SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664"
 
 S = "${WORKDIR}/git"
 
@@ -15,7 +15,7 @@ inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
-DEPENDS += "vulkan-headers vulkan-loader"
+DEPENDS += "vulkan-headers vulkan-loader vulkan-volk"
 
 EXTRA_OECMAKE = "\
                  -DBUILD_TESTS=OFF \
@@ -31,6 +31,7 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
 
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
index 1e2a0aced..239589108 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
@@ -8,14 +8,14 @@ SECTION = "libs"
 LICENSE = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
 
-SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https"
-SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https"
+SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2"
 
 S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
-DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang"
+DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
 
 # BUILD_TESTS            - Not required for OE builds
 # USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
@@ -42,7 +42,8 @@ FILES_SOLIBSDEV = ""
 
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools,
-# vulkan-validation-layers, spirv-headers, spirv-tools
+# vulkan-validation-layers, spirv-headers, spirv-tools,
+# vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
index 23168ae16..5e8f5402e 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
 
 DEPENDS = "libdrm ${LIBGAL_IMX}"
 LIBGAL_IMX              = "libgal-imx"
@@ -15,15 +15,13 @@ PROVIDES += "virtual/libg2d"
 SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
 IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
 
-IMX_SRCREV_ABBREV = "6a00326"
+IMX_SRCREV_ABBREV = "7943590"
 IMX_SRC_URI_NAME = "v1"
-SRC_URI[v1.md5sum] = "470ad0bdef7dec171395991d47b39e2c"
-SRC_URI[v1.sha256sum] = "4d8e4b536bd24eedfbce375a06c19ab74603291b8b5a5be36b03fbf6e016e940"
+SRC_URI[v1.sha256sum] = "bf347f53e8f390a0554c0db76707819bb50cf4aaa564a9c86821ae9add26e113"
 
-IMX_SRCREV_ABBREV:mx95-nxp-bsp = "6a00326"
+IMX_SRCREV_ABBREV:mx95-nxp-bsp = "7943590"
 IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
-SRC_URI[v2.md5sum] = "cf807c38a110763c19a12d6d595b4b09"
-SRC_URI[v2.sha256sum] = "1b86d4fecd5026e871da0de8ed6382c962460468d8151ae2f95b72d00bca17ee"
+SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076"
 
 S = "${WORKDIR}/${IMX_BIN_NAME}"
 
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 0f0c18967..ab0819c69 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 
 DEPENDS = "cairo"
 
-PV = "2.1+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 
 SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
 GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
-SRCBRANCH = "imx_2.1"
+SRCBRANCH = "imx_2.2"
 SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
index d12d9c1a8..7ce542d0a 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
@@ -5,17 +5,15 @@
 
 DESCRIPTION = "G2D library using i.MX GPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
 DEPENDS = "libgal-imx"
 PROVIDES = "virtual/libg2d"
 
 SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
 IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
-IMX_SRCREV_ABBREV = "bc7b6a2"
-SRC_URI[aarch64.md5sum] = "4b12d0434d612b57ff4d7df690c3154f"
-SRC_URI[aarch64.sha256sum] = "b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918"
-SRC_URI[arm.md5sum] = "4bead15838f47793f59cb374c10c2dd2"
-SRC_URI[arm.sha256sum] = "413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663"
+IMX_SRCREV_ABBREV = "95408a4"
+SRC_URI[aarch64.sha256sum] = "48327fe6315aa739d5665004289412ff2e3a4e0084d1664f837276f09d35b032"
+SRC_URI[arm.sha256sum] = "f28b2cd7b29302cd654fc845a0695d6fe935e383b56556e36933488dfa014830"
 
 S = "${WORKDIR}/${IMX_BIN_NAME}"
 
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 4481188b1..88fc60aeb 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,19 +1,19 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
 
 PROVIDES += "virtual/libg2d"
 
-PV = "2.1.0+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 
 SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
 IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
-SRCBRANCH = "imx_2.1"
-SRCREV = "edd234c4e1c58cd2453963d19155d4d5d3800d07"
+SRCBRANCH = "imx_2.2"
+SRCREV = "5e633f895a84cec809ca98d77c879af3591b3b20"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 2d02d7abb..ee9c391f0 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -63,6 +63,12 @@ PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
 
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
 
+RPROVIDES_OPENCL               = "opencl-icd-loader-dev"
+RPROVIDES_OPENCL:mx7-nxp-bsp   = ""
+RPROVIDES_OPENCL:mx8mm-nxp-bsp = ""
+
+RPROVIDES:${PN}:append:imx-nxp-bsp = " ${RPROVIDES_OPENCL}"
+
 PE = "1"
 
 inherit fsl-eula-unpack
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
deleted file mode 100644
index db99b1c71..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-
-IMX_SRCREV_ABBREV = "bc7b6a2"
-
-SRC_URI[md5sum] = "d921b6daf89eba252b0b5b59abe0d690"
-SRC_URI[sha256sum] = "cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3"
-
-COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
deleted file mode 100644
index fb73322ae..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-
-IMX_SRCREV_ABBREV = "bc7b6a2"
-
-SRC_URI[md5sum] = "e6ac75617944d9a9dbba90f863f07e0f"
-SRC_URI[sha256sum] = "5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1"
-
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
new file mode 100644
index 000000000..4cdc1d6af
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+
+IMX_SRCREV_ABBREV = "95408a4"
+
+SRC_URI[sha256sum] = "c479c98e83866a7e95e5a6ae29b21ae41f9599326298d9a1debf009cac6e9406"
+
+COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
new file mode 100644
index 000000000..c5208b554
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+
+IMX_SRCREV_ABBREV = "95408a4"
+
+SRC_URI[sha256sum] = "aadfcf558d07da253a57acfd5aa4ca41d4c8195f04324d0c2f6746f6f18c5a46"
+
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
new file mode 100644
index 000000000..da738aabe
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -0,0 +1,52 @@
+From 3448c245b15928aa5a5a3695d9271fb201eb2e3b Mon Sep 17 00:00:00 2001
+From: Yuan Tian <yuan.tian@nxp.com>
+Date: Sat, 27 Apr 2024 06:06:54 +0800
+Subject: [PATCH] LF-11869 change mali wsi layer activating order
+
+Upstream-Status: Inappropriate [i.MX specific]
+
+Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
+---
+ loader/loader.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/loader/loader.c b/loader/loader.c
+index e646b28b4..55912c178 100644
+--- a/loader/loader.c
++++ b/loader/loader.c
+@@ -2906,6 +2906,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+ #if !defined(_WIN32)
+     char temp_path[2048];
+ #endif
++    bool has_wsi_layer = false;
+ 
+     // Now, parse the paths
+     next_file = search_path;
+@@ -2965,6 +2966,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                 name = full_path;
+ 
+                 VkResult local_res;
++                if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) {
++                    has_wsi_layer = true;
++                    continue;
++                }
+                 local_res = add_if_manifest_file(inst, name, out_files);
+ 
+                 // Incomplete means this was not a valid data file.
+@@ -2975,6 +2980,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                     break;
+                 }
+             }
++
++            if(has_wsi_layer) {
++                name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json";
++                vk_result = add_if_manifest_file(inst, name, out_files);
++                has_wsi_layer = false;
++            }
++
+             loader_closedir(inst, dir_stream);
+             if (vk_result != VK_SUCCESS) {
+                 goto out;
+-- 
+2.34.1
+
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
index c1a9902b7..9b0ce3b99 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
@@ -1,3 +1,9 @@
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}:"
+
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
+"
+
 # libvulkan.so is loaded dynamically, so put it in the main package
 SOLIBS          = ".so*"
 FILES_SOLIBSDEV = ""
diff --git a/recipes-graphics/wayland/weston_12.0.4.imx.bb b/recipes-graphics/wayland/weston_12.0.4.imx.bb
index 87593e4bd..8003da07b 100644
--- a/recipes-graphics/wayland/weston_12.0.4.imx.bb
+++ b/recipes-graphics/wayland/weston_12.0.4.imx.bb
@@ -172,7 +172,7 @@ SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
 WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
 SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
 SRCBRANCH = "weston-imx-12.0.4"
-SRCREV = "461c49d20677cfd36d01a95dafbd9eedf2a4b09c"
+SRCREV = "c3c1f9ff7824123dd4808ace3c9476345cb84177"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
@@ -186,6 +186,9 @@ PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
 # Weston with i.MX G2D renderer
 PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
 
+# Weston on RDP, fix for base recipe
+PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
+
 # links with imx-gpu libs which are pre-built for glibc
 # gcompat will address it during runtime
 LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index b05c3a48c..d1eec405e 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -20,7 +20,7 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
 SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
index c53025b75..f6d094f55 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
@@ -190,8 +190,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
 SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch"
 GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
-SRCREV = "869cef4efbc004c795392d274e617f2dfa71ac98"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
+SRCREV = "7011fdfa6d60fb3ee1dc8545f675cfdb519203cd"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
index 348a30dc5..6e7bc20eb 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
@@ -118,8 +118,8 @@ SRC_URI:remove = " \
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
 
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
-SRCREV = "1c9913d7ce81c43cbf756158a35f61dbeee19ea3"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
+SRCREV = "97b1a45e945d3784790cafd2fcc4f6cb16e739d7"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
index 5d5a2425c..67dc139fa 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
@@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu
 
 SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
-SRCREV = "50535da48c564bd3a46b2e39e0a3a97cf7e86df3"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
+SRCREV = "d8727edd56536a5c39de7905f073fce61896c0af"
 
 # set 32bit compile timer for 32-bit platform
 GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = ""
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
index 33b3c65c1..43cb6a4a2 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
@@ -95,8 +95,8 @@ LIC_FILES_CHKSUM = " \
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
-SRCREV = "753c7b4471d14befd1b7c9cd3fa9af9f10ab4a08"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
+SRCREV = "eb286c0766a4fbbae70c8e9dda074f5a90e52e42"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
deleted file mode 100644
index 5a58a5a67..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bda3461b0b6493f3e04910e82e6e530a64af26b1 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Mon, 24 Jul 2023 12:09:34 -0700
-Subject: [PATCH] meson: Undef _TIME_BITS along with _FILE_OFFSET_BITS
-
-On gcc 13, _TIME_BITS is set to 64 and causes failure with the undef of
-_FILE_OFFSET_BITS:
-```
-/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-   26 | #   error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-      |     ^~~~~
-```
-
-Upstream-Status: Pending
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 7ec5c70..64b2930 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,6 +24,7 @@ gst_dep = dependency('gstreamer-' + api_version, version : gst_req)
- #meson automaticaly add _FILE_OFFSET_BITS=64 to gcc, this will make ipu test
- #case fail when do mmap on 6q, autoconf didn't add this define, so undef it
- add_project_arguments('-U_FILE_OFFSET_BITS', language: 'c')
-+add_project_arguments('-U_TIME_BITS', language: 'c')
- 
- #below two marcos are defined in autoconf
- add_project_arguments ('-DARM', language: 'c')
--- 
-2.25.1
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index d5ba00ed2..e58980771 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -34,13 +34,11 @@ RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
 
-PV = "4.9.0+git${SRCPV}"
+PV = "4.9.1+git${SRCPV}"
 
-SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
-           file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \
-           "
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
-SRCREV = "c3049a137f79e4eabc98785aefcd217ebcde9e96"
+SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
+SRCREV = "87135d5f084b6c61efa6671cddc3a5509ab11640"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb
index 86bab3fce..890a25b4a 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb
@@ -1,15 +1,15 @@
-# Copyright 2023 NXP
+# Copyright 2023-2024 NXP
 DESCRIPTION = "NXP Multimedia opencl converter lib"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 DEPENDS = "virtual/opencl-icd"
 
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "efe25d6"
+IMX_SRCREV_ABBREV = "f2c3930"
 
-SRC_URI[md5sum] = "daa99b8615ca08280833bb80bc52c9be"
-SRC_URI[sha256sum] = "1717f7fe64b260156b8d5b353add5edb7bc0217dd3847ac641601d4a59494f08"
+SRC_URI[md5sum] = "c57b978d29bf136be3523676ad088b07"
+SRC_URI[sha256sum] = "eb3df72a7e1d16ec1660978cf36b7818b8ac7c7defe3222ae4bb7dabd4a5f4cc"
 
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack autotools pkgconfig meson
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb
index 4bbf6dfb6..4094809f4 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -13,9 +13,12 @@ RREPLACES:${PN} = "libfslparser"
 RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
 
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "700b4cf3ba547dc740a064787f528af0"
-SRC_URI[sha256sum] = "2f0fc3955f824936c359b3cb738549213823b0c366b2362bba593058da745677"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "5d91190"
+S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+
+SRC_URI[md5sum] = "086773073ed8fba17eab80b35a740a46"
+SRC_URI[sha256sum] = "087badea414540d1b9403be1a0c7fc91ac42a61f0374857972cd06d8c392ddec"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index f7a8e3521..2b737999e 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=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
@@ -15,8 +15,8 @@ SRC_URI = " \
     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.09.00_2405_L6.6.y"
-SRCREV = "73093da30dc4053c9f69813a6447091bfca5429b"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
+SRCREV = "c13069d239cae314adc3651df25b96afa46cb434"
 
 S = "${WORKDIR}/git"