224 files changed, 2866 insertions, 1493 deletions
diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
index cf3177704..6faabda04 100644
--- a/.github/workflows/backport.yaml
+++ b/.github/workflows/backport.yaml
@@ -1,28 +1,21 @@
-name: Backport labeled merged pull requests
+name: Backport merged pull requests
 on:
  pull_request_target:
-    types: [closed]
+    types: [closed, labeled]
+permissions:
+  contents: write
+  pull-requests: write
 jobs:
-  build:
+  backport:
    name: Create backport PRs
    runs-on: ubuntu-latest
-    # Only run when pull request is merged
+    # Run on merged PRs that carry a 'backport <branch>' label, whether the
-    # or when a comment containing `/backport` is created
+    # label was added before the merge or afterwards.
    if: github.event.pull_request.merged
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
-          # Required to find all branches
          fetch-depth: 0
-      - name: Create backport PRs
+      - uses: korthout/backport-action@v4
-        # Should be kept in sync with `version`
-        uses: zeebe-io/backport-action@v0.0.4
-        with:
-          # Required
-          # Version of the backport-action
-          # Must equal the version in `uses`
-          # Recommended: latest tag or `master`
-          version: v0.0.4
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_workspace: ${{ github.workspace }}
diff --git a/LICENSE b/LICENSE
index 67b326c9c..69b1cd2fd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,14 +3,17 @@
 This file lists all licenses used by recipes in the meta-freescale layer.
 ./dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb: LICENSE = "BSD-3-Clause"
-./dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2025q4.bb: LICENSE = "BSD-3-Clause"
+./dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2026q1.bb: LICENSE = "BSD-3-Clause"
+./dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb: LICENSE = "GPL-2.0-only"
+./dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb: LICENSE = "BSD-3-Clause"
 ./dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb: LICENSE = "MIT"
+./dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb: LICENSE = "Apache-2.0"
 ./recipes-bsp/atf/qoriq-atf-2.12.inc: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/boot-format/boot-format_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-bsp/ddr-phy/ddr-phy_git.bb: LICENSE = "NXP-Binary-EULA"
 ./recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb: LICENSE = "Proprietary"
-./recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb: LICENSE = "Proprietary"
+./recipes-bsp/firmware-imx/firmware-ele-imx_2.0.5.bb: LICENSE = "Proprietary"
-./recipes-bsp/firmware-imx/firmware-imx-8.28.inc: LICENSE = "Proprietary"
+./recipes-bsp/firmware-imx/firmware-imx-8.31.inc: LICENSE = "Proprietary"
 ./recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb: LICENSE = "Proprietary"
 ./recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb: LICENSE = "Proprietary"
@@ -27,14 +30,14 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/imx-test/imx-test_00.00.00.bb: LICENSE = "MIT"
 ./recipes-bsp/imx-test/imx-test_git.bb: LICENSE = "GPL-2.0-or-later"
 ./recipes-bsp/imx-uuc/imx-uuc_git.bb: LICENSE = "GPL-2.0-only"
-./recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb: LICENSE = "Proprietary"
+./recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb: LICENSE = "Proprietary"
-./recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb: LICENSE = "MIT"
+./recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb: LICENSE = "MIT"
-./recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb: LICENSE = "Proprietary"
+./recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb: LICENSE = "Proprietary"
 ./recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb: LICENSE = "Proprietary"
 ./recipes-bsp/inphi/inphi_git.bb: LICENSE = "NXP-Binary-EULA"
-./recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb: LICENSE = "Proprietary"
+./recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb: LICENSE = "Proprietary"
-./recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb: LICENSE = "Proprietary"
+./recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb: LICENSE = "Proprietary"
-./recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb: LICENSE = "LGPL-2.1-only"
+./recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb: LICENSE = "LGPL-2.1-only"
 ./recipes-bsp/ls2-phy/ls2-phy_git.bb: LICENSE = "NXP-Binary-EULA"
 ./recipes-bsp/mc-utils/mc-utils_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/mxsldr/mxsldr_git.bb: LICENSE = "GPL-2.0-or-later"
@@ -49,12 +52,12 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-core/udev/udev-rules-imx.bb: LICENSE = "MIT"
 ./recipes-core/udev/udev-rules-qoriq.bb: LICENSE = "MIT"
 ./recipes-devtools/devregs/devregs_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-devtools/half/half_2.1.0.bb: LICENSE = "MIT"
 ./recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb: LICENSE = "LGPL-2.1-only"
 ./recipes-devtools/qemu/qemu-qoriq.inc: LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 ./recipes-devtools/qoriq-cst/qoriq-cst_git.bb: LICENSE = "BSD-3-Clause"
-./recipes-devtools/utp-com/utp-com_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-devtools/stb/stb_git.bb: LICENSE = "MIT"
 ./recipes-devtools/uuu/uuu-bin_1.5.233.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
-./recipes-devtools/uuu/uuu_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb: LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
 ./recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb: LICENSE = "MIT"
 ./recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb: LICENSE  = "Apache-2.0"
@@ -86,28 +89,41 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-extended/skmm-ep/skmm-ep_git.bb: LICENSE = "BSD & GPL-2.0-only"
 ./recipes-extended/testfloat/testfloat_2a.bb: LICENSE = "TestFloat"
 ./recipes-extended/tsntool/tsntool_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-fsl/fsl-rc-local/fsl-rc-local.bb: LICENSE = "LGPL-2.0-only"
+./recipes-fsl/images/fsl-image-machine-test.bb: LICENSE = "MIT"
 ./recipes-fsl/images/fsl-image-mfgtool-initramfs.bb: LICENSE = "MIT"
+./recipes-fsl/images/fsl-image-multimedia.bb: LICENSE = "MIT"
+./recipes-fsl/images/fsl-image-network-full-cmdline.bb: LICENSE = "MIT"
 ./recipes-fsl/mcore-demos/imx-mcore-demos.inc: LICENSE = "Proprietary"
+./recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb: LICENSE_FLAGS = "commercial"
 ./recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb: LICENSE = "MIT"
-./recipes-graphics/drm/libdrm_2.4.123.imx.bb: LICENSE = "MIT"
+./recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb: LICENSE = "MIT"
-./recipes-graphics/imx-g2d/imx-dpu-g2d_2.4.0.0.bb: LICENSE = "Proprietary"
+./recipes-graphics/devil/devil_1.8.0.bb: LICENSE = "LGPL-2.1-only"
+./recipes-graphics/drm/libdrm_2.4.127.imx.bb: LICENSE = "MIT"
+./recipes-graphics/gli/gli_0.8.4.0.bb: LICENSE = "MIT"
+./recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb: LICENSE = "Proprietary"
 ./recipes-graphics/imx-g2d/imx-g2d-samples_git.bb: LICENSE = "BSD-3-Clause"
-./recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.2.bb: LICENSE = "Proprietary"
+./recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb: LICENSE = "Proprietary"
 ./recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb: LICENSE = "Proprietary"
 ./recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb: LICENSE = "MIT"
+./recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb: LICENSE = "BSD-3-Clause"
+./recipes-graphics/imx-gpu-sdk/libxdg-shell.bb: LICENSE = "BSD-3-Clause"
 ./recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc: LICENSE = "Proprietary"
 ./recipes-graphics/mali/mali-imx_r54.0.bb: LICENSE = "Proprietary"
 ./recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb: LICENSE = "MIT"
+./recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb: LICENSE = "BSD-3-Clause"
+./recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb: LICENSE = "BSD-3-Clause"
+./recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb: LICENSE = "BSD-3-Clause"
+./recipes-graphics/vulkan/assimp_5.4.3.bb: LICENSE = "BSD-3-Clause"
 ./recipes-graphics/vulkan/vulkan-wsi-layer_git.bb: LICENSE = "MIT"
 ./recipes-graphics/wayland/weston_10.0.5.imx.bb: LICENSE = "MIT"
 ./recipes-graphics/wayland/weston_14.0.2.imx.bb: LICENSE = "MIT"
-./recipes-graphics/xwayland/xwayland_24.1.6.imx.bb: LICENSE = "MIT"
 ./recipes-kernel/ceetm/ceetm_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/kernel-modules/kernel-module-ar_git.bb: LICENSE = "GPL-2.0-only & BSD"
 ./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb: LICENSE = "GPL-2.0-only"
-./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.4.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/kernel-modules/kernel-module-ipc.inc: LICENSE = "BSD"
-./recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb: LICENSE = "GPL-2.0-only"
 ./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"
@@ -119,29 +135,32 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb: LICENSE = "Apache-2.0"
 ./recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb: LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-3-Clause"
 ./recipes-multimedia/alsa/imx-alsa-plugins_git.bb: LICENSE = "GPL-2.0-only"
-./recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb: LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb: LICENSE = "LGPL-2.0-or-later"
+./recipes-multimedia/gstreamer/gst-examples_1.26.6.bb: LICENSE = "LGPL-2.0-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb: LICENSE_FLAGS = "commercial"
+./recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb: LICENSE = "GPL-3.0-only"
+./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb: LICENSE_FLAGS = "commercial"
 LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb: LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb: LICENSE = "LGPL-2.1-or-later"
 ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb: LICENSE = "LGPL-2.0-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LICENSE_FLAGS = "commercial"
-./recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb: LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb: LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb: LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb: LICENSE = "LGPL-2.1-or-later"
 ./recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb: LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only"
 ./recipes-multimedia/imx-codec/imx-codec_4.10.0.bb: LICENSE = "Proprietary"
 ./recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb: LICENSE = "Proprietary"
 ./recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb: LICENSE = "Proprietary"
 ./recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb: LICENSE = "Proprietary"
-./recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb: LICENSE = "Proprietary"
+./recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb: LICENSE = "Proprietary"
-./recipes-multimedia/imx-parser/imx-parser_4.10.0.bb: LICENSE = "Proprietary"
+./recipes-multimedia/imx-parser/imx-parser_4.10.3.bb: LICENSE = "Proprietary"
 ./recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb: LICENSE = "Proprietary"
 ./recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb: LICENSE = "Proprietary"
+./recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb: LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+./recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb: LICENSE = "Apache-2.0 & BSD-2-Clause & GPL-2.0-or-later & LGPL-2.1-or-later & MIT & Proprietary"
 ./recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb: LICENSE = "LGPL-2.1-only"
 ./recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb: LICENSE = "LGPL-2.1-only"
 ./recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb: LICENSE = "Proprietary"
@@ -150,7 +169,8 @@ LICENSE_FLAGS = "commercial"
 ./recipes-security/optee-imx/optee-client-fslc.inc: LICENSE = "BSD-2-Clause"
 ./recipes-security/optee-imx/optee-os-fslc.inc: LICENSE = "BSD-2-Clause"
 ./recipes-security/optee-imx/optee-test-fslc.inc: LICENSE = "BSD-2-Clause & GPL-2.0-only"
+./recipes-security/smw/crypto-af-alg_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-security/smw/itest_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-security/smw/keyctl-caam_git.bb: LICENSE = "BSD-3-Clause"
-./recipes-security/smw/smw_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-security/smw/smw_5.3.bb: LICENSE = "BSD-3-Clause"
 LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib"
-./recipes-support/opencv/opencv_4.6.0.imx.bb: LICENSE = "Apache-2.0"
diff --git a/README.md b/README.md
index 91ffff93b..03f71b45a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,11 @@ Welcome to `meta-freescale`. This document outlines our commitment to providing
 This layer provides support for NXP's platforms for use with OpenEmbedded and/or Yocto Project.
-### Dependencies
+## Maintainer
+Otavio Salvador <otavio.salvador@ossystems.com.br>
+## Dependencies
 This layer depends on:
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..3ebe6e61f
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,17 @@
+# How to Report a Potential Vulnerability
+  Confirmed or potential security vulnerabilities in the meta-freescale layer
+  should be submitted through the
+  [Issues](https://github.com/Freescale/meta-freescale/issues) page.
+  For urgent or not-yet-released issues, contact the maintainer listed in the
+  [README](README.md). Include:
+  - The affected layer or software module
+  - The recipe and its version
+  - Example code, if available
+  ## Branches Maintained with Security Fixes
+  See the [Yocto Project release list](https://wiki.yoctoproject.org/wiki/Releases).
+  Security patches are accepted for the LTS releases and the master branch.
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 57ec558c6..5365e5fd7 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -1,6 +1,6 @@
 #
 # This class provides a support to build the boot container for
-# i.MX8M and i.MX95 derivatives
+# i.MX8M, i.MX91, i.MX93 and i.MX95 derivatives
 #
 # imx8m machines require a separate build target to be executed
 # due to the fact that final boot image is constructed using flash.bin
@@ -26,7 +26,7 @@
 inherit use-imx-security-controller-firmware
 # Define ATF binary file to be deployed to the U-Boot build folder
-ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin"
+ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
@@ -36,6 +36,12 @@ IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = " \
    signed_dp_imx8m.bin \
    signed_hdmi_imx8m.bin \
 "
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx91-generic-bsp = " \
+    ${SECO_FIRMWARE_NAME} \
+"
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx93-generic-bsp = " \
+    ${SECO_FIRMWARE_NAME} \
+"
 IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = " \
    ${SECO_FIRMWARE_NAME} \
    ${OEI_NAME} \
diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass
index 5186c2a41..9c8f9ce7d 100644
--- a/classes/qoriq_build_64bit_kernel.bbclass
+++ b/classes/qoriq_build_64bit_kernel.bbclass
@@ -12,7 +12,7 @@ python () {
        d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options)
        d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False))
-    error_qa = d.getVar('ERROR_QA')
+        error_qa = (d.getVar('ERROR_QA') or '').split()
-    if 'arch' in error_qa:
+        if 'arch' in error_qa:
-        d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
+            d.setVar('ERROR_QA', ' '.join(flag for flag in error_qa if flag != 'arch'))
 }
diff --git a/conf/fragments/bsp/fslc.conf b/conf/fragments/bsp/fslc.conf
new file mode 100644
index 000000000..4cf33a1b7
--- /dev/null
+++ b/conf/fragments/bsp/fslc.conf
@@ -0,0 +1,8 @@
+BB_CONF_FRAGMENT_SUMMARY = "Use FSLC BSP components (linux-fslc, u-boot-fslc)"
+BB_CONF_FRAGMENT_DESCRIPTION = "Sets IMX_DEFAULT_BSP = 'mainline' and selects the FSLC \
+linux-fslc kernel and u-boot-fslc bootloader as defaults for i.MX builds. \
+Note: DISTRO = 'poky' is used as-is; TARGET_VENDOR and DISTROOVERRIDES from \
+the legacy fslc-base.inc are not carried over."
+IMX_DEFAULT_BSP = "mainline"
+IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
diff --git a/conf/fragments/bsp/nxp.conf b/conf/fragments/bsp/nxp.conf
new file mode 100644
index 000000000..8a13b96ff
--- /dev/null
+++ b/conf/fragments/bsp/nxp.conf
@@ -0,0 +1,32 @@
+BB_CONF_FRAGMENT_SUMMARY = "Use NXP downstream BSP components (linux-imx, u-boot-imx)"
+BB_CONF_FRAGMENT_DESCRIPTION = "Sets IMX_DEFAULT_BSP = 'nxp' and selects NXP downstream \
+providers for the kernel, bootloader, and GStreamer plugins on mx6/mx7/mx8/mx9 SoCs. \
+Requires a layer providing linux-imx and u-boot-imx (e.g. meta-imx). \
+Note: DISTRO = 'poky' is used as-is; TARGET_VENDOR and DISTROOVERRIDES from \
+the legacy fsl-base.inc are not carried over."
+IMX_DEFAULT_BSP = "nxp"
+IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
+PREFERRED_PROVIDER_virtual/kernel:mx6-nxp-bsp = "linux-imx"
+PREFERRED_PROVIDER_virtual/kernel:mx7-nxp-bsp = "linux-imx"
+PREFERRED_PROVIDER_virtual/kernel:mx8-nxp-bsp = "linux-imx"
+PREFERRED_PROVIDER_virtual/kernel:mx9-nxp-bsp = "linux-imx"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx6-nxp-bsp = "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx7-nxp-bsp = "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx8-nxp-bsp = "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx9-nxp-bsp = "imx-gst1.0-plugin"
+PREFERRED_VERSION_gstreamer1.0              ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad  ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good ??= "1.24.7.imx"
+PREFERRED_VERSION_gst-devtools              ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-libav        ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-python       ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server  ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-vaapi        ??= "1.24.0.imx"
+PACKAGECONFIG:append:pn-pulseaudio = " autospawn-for-root"
diff --git a/conf/fragments/graphics/x11.conf b/conf/fragments/graphics/x11.conf
new file mode 100644
index 000000000..11fb07b88
--- /dev/null
+++ b/conf/fragments/graphics/x11.conf
@@ -0,0 +1,5 @@
+BB_CONF_FRAGMENT_SUMMARY = "Enable X11 display backend"
+BB_CONF_FRAGMENT_DESCRIPTION = "Enables X11 display backend while removing Wayland support."
+DISTRO_FEATURES:remove = "wayland"
+DISTRO_FEATURES:append = " x11"
diff --git a/conf/layer.conf b/conf/layer.conf
index ad2f52d75..c91f4c4f8 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -57,6 +57,8 @@ BBFILES_DYNAMIC += " \
    multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \
    multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \
    \
+    networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
+    \
    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
    \
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index a9ff8bf10..b419bb1d4 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -11,7 +11,7 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 MACHINE_FIRMWARE:append = " firmware-imx-epdc"
-MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio"
+MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
 MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 KERNEL_DEVICETREE = " \
diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index a71ec3019..1ee50439d 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -14,7 +14,7 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"
 # NXP BSP can consume proprietary jailhouse and Broadcom drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 nxpwifi-all-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359 nxpwifi-all-sdio"
 KERNEL_DEVICETREE_BASENAME = "imx8mn-ddr3l-evk"
 KERNEL_DEVICETREE = " \
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 9e5c27b43..9974928db 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -14,7 +14,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 # inline NEON and FPU code generation
 DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
-MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio"
+MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp9098-pcie nxp9098-sdio"
 MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359 jailhouse nxpwifi-all-pcie nxpwifi-all-sdio"
 MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index bb65ae13e..4eef2bce8 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -11,7 +11,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
 IMX_DEFAULT_BSP = "nxp"
-MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
+MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp9098-pcie"
 MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio"
 # Don't include kernels in standard images
@@ -107,8 +107,8 @@ IMAGE_BOOT_FILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin"
 ATF_PLATFORM = "imx8qm"
 IMXBOOT_TARGETS_SD = \
-    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \
+    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl flash_linux_m4', \
-                                                       'flash flash_ca72', d)}"
+                                                       'flash flash_ca72 flash_regression_linux_m4', d)}"
 IMXBOOT_TARGETS_FSPI = \
    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \
                                                       'flash_flexspi', d)}"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 8810085d6..6a0fe3f11 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -467,22 +467,10 @@ MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455',
 MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}"
 # Extra NXP Wi-Fi and Bluetooth driver firmware and driver
-MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'firmware-nxp-wifi-nxp8801-sdio', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'kernel-module-nxp-wlan', '', d)}"
 MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}"
 MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp-wlan', '', d)}"
 PREFERRED_RPROVIDER_linux-firmware-nxp8987-sdio = "firmware-nxp-wifi"
-MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'firmware-nxp-wifi-nxp8997-pcie', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'kernel-module-nxp-wlan', '', d)}"
-PREFERRED_RPROVIDER_linux-firmware-nxp8997-common = "firmware-nxp-wifi"
-PREFERRED_RPROVIDER_linux-firmware-nxp8997-pcie = "firmware-nxp-wifi"
-MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'firmware-nxp-wifi-nxp8997-sdio', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'kernel-module-nxp-wlan', '', d)}"
-PREFERRED_RPROVIDER_linux-firmware-nxp8997-sdio = "firmware-nxp-wifi"
 MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}"
 MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp-wlan', '', d)}"
 PREFERRED_RPROVIDER_linux-firmware-nxp9098-common = "firmware-nxp-wifi"
@@ -513,9 +501,12 @@ MACHINE_EXTRA_RRECOMMENDS += " \
    ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \
 "
-# ELE extra Firmware
+# ELE extra Firmware,to be installed and accessed from userspace.
-SECOEXT_FIRMWARE_NAME ?= "UNDEFINED"
+# Note that multiple names can be given in order to install multiple versions
+# to a single rootfs.
+SECOEXT_FIRMWARE_NAME ?= ""
 SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img"
+SECOEXT_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95a0runtime-ahab-container.img mx95b0runtime-ahab-container.img"
 SECOEXT_FIRMWARE_NAME:mx943-generic-bsp  ?= "mx943${IMX_SOC_REV_LOWER}runtime-ahab-container.img"
 # GStreamer 1.0 plugins
@@ -538,20 +529,28 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin"
 MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp   ?= "imx-gst1.0-plugin"
 # GStreamer forked recipes
-PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp              ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp              ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp  ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp  ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.6.imx"
 # GStreamer copied recipes
-PREFERRED_VERSION_gst-devtools:imx-nxp-bsp              ??= "1.26.0.imx"
+PREFERRED_VERSION_gst-devtools:imx-nxp-bsp              ??= "1.26.6"
-PREFERRED_VERSION_gst-examples:imx-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gst-examples:imx-nxp-bsp              ??= "1.26.6"
-PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp        ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp        ??= "1.26.6"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.6"
-PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp       ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp       ??= "1.26.6"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp  ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp  ??= "1.26.6"
-PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp        ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp        ??= "1.26.6"
+# Use libcamera fork for certain SOCs
+PREFERRED_VERSION_libcamera ??= "${PREFERRED_VERSION_LIBCAMERA_IMX}"
+PREFERRED_VERSION_LIBCAMERA_IMX                = ""
+PREFERRED_VERSION_LIBCAMERA_IMX:mx95-nxp-bsp   = "0.6.0.imx"
+PREFERRED_VERSION_LIBCAMERA_IMX:mx8mm-nxp-bsp  = "0.6.0.imx"
+PREFERRED_VERSION_LIBCAMERA_IMX:mx8ulp-nxp-bsp = "0.6.0.imx"
+PREFERRED_VERSION_LIBCAMERA_IMX:mx8mq-nxp-bsp  = "0.6.0.imx"
 # Determines if the SoC has support for Vivante kernel driver
 SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT        = "0"
@@ -600,10 +599,8 @@ PREFERRED_VERSION_weston:mx6-nxp-bsp      ??= "10.0.5.imx"
 PREFERRED_VERSION_weston:mx7-nxp-bsp      ??= "10.0.5.imx"
 PREFERRED_VERSION_weston:imx-mainline-bsp   = ""
-PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx"
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx"
+PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.127.imx"
 PREFERRED_VERSION_glslang:imxvulkan                  ??= "1.3.275.0.imx"
 PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.275.0.imx"
@@ -615,10 +612,10 @@ PREFERRED_VERSION_vulkan-utility-libraries: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:imx-nxp-bsp     ??= "4.6.0.imx"
+PREFERRED_VERSION_optee-os:imx-nxp-bsp     ??= "4.8.0.imx"
-PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.6.0.imx"
+PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.8.0.imx"
-PREFERRED_VERSION_optee-test:imx-nxp-bsp   ??= "4.6.0.imx"
+PREFERRED_VERSION_optee-test:imx-nxp-bsp   ??= "4.8.0.imx"
-PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp   ??= "4.6.0.imx"
+PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp   ??= "4.8.0.imx"
 # Use i.MX opencv Version
 PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 50ee85b42..44a55c00b 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -5,7 +5,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
-MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
+MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp9098-pcie"
 MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 dpdk nxpwifi-all-sdio"
 # Don't include kernels in standard images
@@ -45,8 +45,8 @@ UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
 IMX_BOOT_SEEK = "32"
 IMXBOOT_TARGETS_SD = \
-    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \
+    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl flash_linux_m4 flash_linux_m4_no_v2x ', \
-                                                       'flash', d)}"
+                                                       'flash flash_regression_linux_m4', d)}"
 IMXBOOT_TARGETS_FSPI = \
    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \
                                                       'flash_flexspi', d)}"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 79d7bc15e..d7ec72a9a 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -8,7 +8,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 # inline NEON and FPU code generation
 DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
-MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio"
+MACHINE_FEATURES += "pci wifi bluetooth nxp9098-pcie nxp9098-sdio"
 # NXP BSP can consume proprietary jailhouse and Marvell drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
diff --git a/conf/machine/include/imx8ulp-evk.inc b/conf/machine/include/imx8ulp-evk.inc
index 7a1f2213d..967f3ec7d 100644
--- a/conf/machine/include/imx8ulp-evk.inc
+++ b/conf/machine/include/imx8ulp-evk.inc
@@ -26,9 +26,9 @@ UBOOT_CONFIG[nd]   = "${UBOOT_CONFIG_BASENAME}_nd_defconfig"
 # Set ATF platform name
 ATF_PLATFORM = "imx8ulp"
-IMXBOOT_TARGETS_SD   = "flash_singleboot flash_dualboot"
+IMXBOOT_TARGETS_SD   = "flash_singleboot_m33 flash_singleboot flash_dualboot_m33 flash_dualboot"
-IMXBOOT_TARGETS_FSPI = "flash_dualboot_flexspi"
+IMXBOOT_TARGETS_FSPI = "flash_singleboot_m33_flexspi flash_dualboot_flexspi"
-IMXBOOT_TARGETS_ND   = ""
+IMXBOOT_TARGETS_ND   = "flash_singleboot_m33"
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG',   'sd', '${IMXBOOT_TARGETS_SD}', \
                      bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index ad3422e07..18c23e1d9 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -3,7 +3,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
-MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
+MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp9098-pcie"
 MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio"
 # Don't include kernels in standard images
@@ -55,8 +55,8 @@ IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
 UBOOT_SUFFIX = "bin"
 IMXBOOT_TARGETS_SD = \
-    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \
+    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl flash_linux_m4', \
-                                                       'flash', d)}"
+                                                       'flash flash_regression_linux_m4', d)}"
 IMXBOOT_TARGETS_FSPI = \
    "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \
                                                       'flash_flexspi', d)}"
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index f504694f3..9e9108d99 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -26,7 +26,6 @@ UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[ecc]  = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
-UBOOT_CONFIG_IMAGE_FSTYPES[sd] = "sdcard"
 # Set ATF platform name
 ATF_PLATFORM = "imx93"
diff --git a/conf/machine/include/imx943-evk.inc b/conf/machine/include/imx943-evk.inc
index a2abe30dc..fb9acd7e1 100644
--- a/conf/machine/include/imx943-evk.inc
+++ b/conf/machine/include/imx943-evk.inc
@@ -36,8 +36,6 @@ UBOOT_CONFIG[sd]     = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[sd-ecc] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[crrm]   = "${UBOOT_CONFIG_BASENAME}_xspi_crrm_defconfig"
 UBOOT_CONFIG[xspi]   = "${UBOOT_CONFIG_BASENAME}_xspi_defconfig"
-UBOOT_CONFIG_IMAGE_FSTYPES[sd]     = "sdcard"
-UBOOT_CONFIG_IMAGE_FSTYPES[sd-ecc] = "sdcard"
 ATF_PLATFORM = "imx94"
 OEI_CORE = "m33"
diff --git a/conf/machine/include/imx95-evk.inc b/conf/machine/include/imx95-evk.inc
index 3cea26090..8e078fe79 100644
--- a/conf/machine/include/imx95-evk.inc
+++ b/conf/machine/include/imx95-evk.inc
@@ -21,7 +21,6 @@ UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[sd-ecc] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
-UBOOT_CONFIG_IMAGE_FSTYPES[sd] = "sdcard"
 ATF_PLATFORM = "imx95"
 OEI_CORE   = "m33"
diff --git a/default-registry/configurations/fsl-community-bsp-master.conf.json b/default-registry/configurations/fsl-community-bsp-master.conf.json
index fa08eacea..e392c1762 100644
--- a/default-registry/configurations/fsl-community-bsp-master.conf.json
+++ b/default-registry/configurations/fsl-community-bsp-master.conf.json
@@ -167,73 +167,39 @@
                    ]
                },
                "distro": {
-                    "description": "Target Distributions",
+                    "description": "Distribution",
                    "options": [
-                        {"name": "distro/fsl",  "description": "FSL NXP BSP base distribution"},
+                        {"name": "distro/poky",    "description": "Poky reference distribution"},
-                        {"name": "distro/fslc", "description": "FSLC Community BSP base distribution"}
+                        {"name": "distro/nodistro", "description": "No distribution policy"}
                    ]
                }
            },
            "configurations": [
            {
-                "name": "fsl",
+                "name": "fslc-framebuffer",
-                "description": "I will use the distro base configuration only (either FSL or FSLC)"
+                "description": "FSLC BSP with framebuffer backend",
-            },
-            {
-                "name": "accept-fsl-eula",
-                "description": "Accept NXP EULA only",
-                "oe-fragments": [
-                    "freescale-layer/accept-fsl-eula"
-                ]
-            },
-            {
-                "name": "fsl-framebuffer",
-                "description": "Accept NXP EULA and configure FrameBuffer backend",
                "oe-fragments": [
-                    "freescale-layer/eula/accept-fsl-eula",
+                    "freescale-layer/bsp/fslc",
                    "freescale-layer/graphics/framebuffer"
                ]
            },
            {
-                "name": "fsl-wayland",
+                "name": "nxp-framebuffer",
-                "description": "Accept NXP EULA and configure Wayland with systemd",
+                "description": "Accept NXP EULA, NXP BSP with framebuffer backend",
                "oe-fragments": [
                    "freescale-layer/eula/accept-fsl-eula",
-                    "freescale-layer/init/systemd",
+                    "freescale-layer/bsp/nxp",
-                    "freescale-layer/graphics/wayland"
+                    "freescale-layer/graphics/framebuffer"
                ]
            },
            {
-                "name": "fsl-xwayland",
+                "name": "fslc-eula-framebuffer",
-                "description": "Accept NXP EULA and configure XWayland with systemd",
+                "description": "Accept NXP EULA, FSLC BSP with framebuffer backend",
                "oe-fragments": [
                    "freescale-layer/eula/accept-fsl-eula",
-                    "freescale-layer/init/systemd",
+                    "freescale-layer/bsp/fslc",
-                    "freescale-layer/graphics/xwayland"
-                ]
-            },
-            {
-                "name": "framebuffer",
-                "description": "Configure FrameBuffer backend",
-                "oe-fragments": [
                    "freescale-layer/graphics/framebuffer"
                ]
-            },
-            {
-                "name": "wayland",
-                "description": "Configure Wayland with systemd",
-                "oe-fragments": [
-                    "freescale-layer/init/systemd",
-                    "freescale-layer/graphics/wayland"
-                ]
-            },
-            {
-                "name": "xwayland",
-                "description": "Configure XWayland with systemd",
-                "oe-fragments": [
-                    "freescale-layer/init/systemd",
-                    "freescale-layer/graphics/xwayland"
-                ]
            }
            ]
        }
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
index 227d76b2c..2962a1acc 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
@@ -12,6 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b66f32a90f9577a5a3255c21d79bc619"
 SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}"
 IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
 SRCBRANCH = "master"
-SRCREV = "49bfaa93e9d1fe213866bcb9507927a59a9ede5a"
+SRCREV = "fa9e9a29e8c8939cc360beafd01393ca393e439a"
 require imx-oei.inc
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2025q4.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2026q1.bb
index 81233bbff..888b883bc 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2025q4.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2026q1.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f2a70813bc08547f509361c08b718861"
 SRC_URI = "${IMX_SYSTEM_MANAGER_SRC};branch=${SRCBRANCH}"
 IMX_SYSTEM_MANAGER_SRC ?= "git://github.com/nxp-imx/imx-sm.git;protocol=https"
 SRCBRANCH = "master"
-SRCREV = "de30901b287e5c9a1e467d2d9a497b97bb6f7939"
+SRCREV = "c450f53974ea1df826970ad399cb338625b5638d"
 require imx-system-manager.inc
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/bluealsa/bluealsa_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/bluealsa/bluealsa_%.bbappend
new file mode 100644
index 000000000..212dd3b7a
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/bluealsa/bluealsa_%.bbappend
@@ -0,0 +1 @@
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch
new file mode 100644
index 000000000..bf41f1b4b
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch
@@ -0,0 +1,31 @@
+From 46670dce02361a318fc66e503d32a0ceb53ec1ea Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Mon, 30 Jun 2025 17:56:50 +0900
+Subject: [PATCH] YOCIMX-9095 pipewiresrc: set rank to secondary
+Upstream-Status: Pending
+currently, pipewiresrc cannot been used as default
+video or audio src, so no need primary rank.
+Signed-off-by: Haihua Hu <jared.hu@nxp.com>
+---
+ src/gst/gstpipewire.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/gst/gstpipewire.c b/src/gst/gstpipewire.c
+index 5761a099d..15f2ac946 100644
+--- a/src/gst/gstpipewire.c
+++ b/src/gst/gstpipewire.c
+@@ -26,7 +26,7 @@ plugin_init (GstPlugin *plugin)
+ {
+   pw_init (NULL, NULL);
+ 
+-  gst_element_register (plugin, "pipewiresrc", GST_RANK_PRIMARY + 1,
+  gst_element_register (plugin, "pipewiresrc", GST_RANK_SECONDARY + 1,
+       GST_TYPE_PIPEWIRE_SRC);
+   gst_element_register (plugin, "pipewiresink", GST_RANK_NONE,
+       GST_TYPE_PIPEWIRE_SINK);
+-- 
+2.34.1
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch
deleted file mode 100644
index ab34dc2fa..000000000
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2cac94185824aa7df07ec48a2872f3d26d517a6d Mon Sep 17 00:00:00 2001
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-Date: Tue, 28 Nov 2023 10:23:42 +0800
-Subject: [PATCH] launch: allow pipewire-pulse can be started by root.
-revert commit 8942f6b40 ("launch: avoid autostarting pipewire-pulse
-systemd units for root")
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
- src/daemon/systemd/user/pipewire-pulse.service.in | 1 -
- src/daemon/systemd/user/pipewire-pulse.socket     | 1 -
- 2 files changed, 2 deletions(-)
-diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in
-index 73d22e532..da7728ee3 100644
--- a/src/daemon/systemd/user/pipewire-pulse.service.in
-+++ b/src/daemon/systemd/user/pipewire-pulse.service.in
-@@ -14,7 +14,6 @@ Description=PipeWire PulseAudio
- # After=pipewire-pulse.socket is not needed, as it is already implicit in the
- # socket-service relationship, see systemd.socket(5).
- Requires=pipewire-pulse.socket
-ConditionUser=!root
- Wants=pipewire.service pipewire-session-manager.service
- After=pipewire.service pipewire-session-manager.service
- Conflicts=pulseaudio.service
-diff --git a/src/daemon/systemd/user/pipewire-pulse.socket b/src/daemon/systemd/user/pipewire-pulse.socket
-index 1ae5edafb..d27fb0e26 100644
--- a/src/daemon/systemd/user/pipewire-pulse.socket
-+++ b/src/daemon/systemd/user/pipewire-pulse.socket
-@@ -1,6 +1,5 @@
- [Unit]
- Description=PipeWire PulseAudio
-ConditionUser=!root
- Conflicts=pulseaudio.socket
- 
- [Socket]
-- 
-2.34.1
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-systemd-allow-pipewire-user-services-for-root.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-systemd-allow-pipewire-user-services-for-root.patch
new file mode 100644
index 000000000..da159cfb2
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-systemd-allow-pipewire-user-services-for-root.patch
@@ -0,0 +1,41 @@
+From 5e89cf0818c555dff31a1ef9e02828c2541b7e1f Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@nxp.com>
+Date: Mon, 31 Mar 2025 14:44:23 +0800
+Subject: [PATCH] systemd: allow pipewire user services for root
+Revert commit 9bc29b4b3 ("systemd: Disable pipewire user services for root")
+BT ofono service needs root permission for starting service.
+wireplumber[789]: 5:185m5:185mspa.bluez5: Failed to start HFP/HSP backend ofono
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
+---
+ src/daemon/systemd/user/pipewire.service.in | 1 -
+ src/daemon/systemd/user/pipewire.socket     | 1 -
+ 2 files changed, 2 deletions(-)
+Index: pipewire-1.4.8/src/daemon/systemd/user/pipewire.service.in
+===================================================================
+--- pipewire-1.4.8.orig/src/daemon/systemd/user/pipewire.service.in
+++ pipewire-1.4.8/src/daemon/systemd/user/pipewire.service.in
+@@ -14,7 +14,6 @@ Description=PipeWire Multimedia Service
+ # After=pipewire.socket is not needed, as it is already implicit in the
+ # socket-service relationship, see systemd.socket(5).
+ Requires=pipewire.socket @PW_SERVICE_REQS@
+-ConditionUser=!root
+ 
+ [Service]
+ LockPersonality=yes
+Index: pipewire-1.4.8/src/daemon/systemd/user/pipewire.socket
+===================================================================
+--- pipewire-1.4.8.orig/src/daemon/systemd/user/pipewire.socket
+++ pipewire-1.4.8/src/daemon/systemd/user/pipewire.socket
+@@ -1,6 +1,5 @@
+ [Unit]
+ Description=PipeWire Multimedia System Sockets
+-ConditionUser=!root
+ 
+ [Socket]
+ Priority=6
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch
new file mode 100644
index 000000000..ce4d14371
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch
@@ -0,0 +1,51 @@
+From f01c4d27819fc2897b10f7e2bc0f30bd183c45b8 Mon Sep 17 00:00:00 2001
+From: Elliot Chen <elliot.chen@nxp.com>
+Date: Sat, 28 Feb 2026 14:47:22 +0900
+Subject: [PATCH] pipewiresrc: update per-plane stride and offset according to
+ chunk info
+Upstream-Status: Pending
+---
+ meson.build              |  2 +-
+ src/gst/gstpipewiresrc.c | 11 +++++++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+diff --git a/meson.build b/meson.build
+index bca2c7a27..e290217e9 100644
+--- a/meson.build
+++ b/meson.build
+@@ -412,7 +412,7 @@ gst_deps_def = {
+   'gio-unix-2.0': {},
+   'gstreamer-1.0': {'version': '>= 1.10.0'},
+   'gstreamer-base-1.0': {},
+-  'gstreamer-video-1.0': {},
+  'gstreamer-video-1.0': {'version': '>= 1.22.0'},
+   'gstreamer-audio-1.0': {},
+   'gstreamer-allocators-1.0': {},
+ }
+diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
+index b0de17dfd..044c0d583 100644
+--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
+@@ -838,6 +838,17 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc)
+ 
+       video_size += d->chunk->size;
+     }
+
+    /* If the buffer number is smaller than the plane number,
+     * update the stride and offset for the remain planes.
+     */
+    if (n_datas && n_datas < n_planes) {
+      for (i = n_datas; i < n_planes; i++) {
+        meta->stride[i] = gst_video_format_info_extrapolate_stride (info->finfo, i, b->buffer->datas[0].chunk->stride);
+        meta->offset[i] = meta->offset[i-1] +
+            meta->stride[i-1] * GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (info->finfo, i-1, GST_VIDEO_INFO_HEIGHT(info));
+      }
+    }
+   }
+ 
+   if (b->buffer->n_datas != gst_buffer_n_memory(data->buf)) {
+-- 
+2.34.1
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index 865b29349..2c28aca5f 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -1,8 +1,12 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:imx-nxp-bsp = " file://0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch"
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-systemd-allow-pipewire-user-services-for-root.patch \
-SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable"
+    file://0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch \
+"
+SRC_URI:append:mx95-nxp-bsp = " \
+    file://0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch \
+"
 DEPENDS:append:mx95-nxp-bsp = " libdrm"
@@ -10,8 +14,6 @@ PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
 PACKAGECONFIG_REMOVE              ?= ""
 PACKAGECONFIG_REMOVE:mx6-nxp-bsp  ?= "gstreamer"
 PACKAGECONFIG_REMOVE:mx7-nxp-bsp  ?= "gstreamer"
-PACKAGECONFIG_REMOVE:mx8-nxp-bsp  ?= "gstreamer"
-PACKAGECONFIG_REMOVE:mx93-nxp-bsp ?= "gstreamer"
 PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}"
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch
new file mode 100644
index 000000000..52db25494
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch
@@ -0,0 +1,33 @@
+From 9cebf00856ef24b9a4d6306775013b10da821172 Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@nxp.com>
+Date: Thu, 9 Nov 2023 15:15:04 +0800
+Subject: [PATCH] wpctl: fix set-default Segmentation fault on 32bit platform
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
+---
+ src/tools/wpctl.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+Index: wireplumber-0.5.11/src/tools/wpctl.c
+===================================================================
+--- wireplumber-0.5.11.orig/src/tools/wpctl.c
+++ wireplumber-0.5.11/src/tools/wpctl.c
+@@ -832,9 +832,16 @@ set_default_parse_positional (gint argc,
+ static gboolean
+ set_default_prepare (WpCtl * self, GError ** error)
+ {
+  g_autoptr (WpPlugin) def_nodes_api = wp_plugin_find (self->core, "default-nodes-api");
+  guint32 id;
+
+  if (!translate_id (def_nodes_api, cmdline.set_default.id, &id, error)) {
+    fprintf(stderr, "Translate ID error.\n");
+    return FALSE;
+  }
+   wp_object_manager_add_interest (self->om, WP_TYPE_NODE,
+       WP_CONSTRAINT_TYPE_PW_GLOBAL_PROPERTY,
+-      "object.id", "=u", (guint32) cmdline.set_default.id,
+      "object.id", "=u", id,
+       NULL);
+   wp_object_manager_request_object_features (self->om, WP_TYPE_NODE,
+       WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL);
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/51-bluez-imx.conf b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/51-bluez-imx.conf
new file mode 100644
index 000000000..cab02a96d
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/51-bluez-imx.conf
@@ -0,0 +1,16 @@
+monitor.bluez.properties = {
+  ## These features do not work on all headsets, so they are enabled
+  ## by default based on the hardware database. They can also be
+  ## forced on/off for all devices by the following options:
+  bluez5.enable-msbc = true
+ 
+  ## HFP/HSP backend (default: native).
+  ## Available values: any, none, hsphfpd, ofono, native
+  bluez5.hfphsp-backend = "ofono"
+  ## HFP/HSP hardware offload SCO support (default: false).
+  ## Using this feature requires a custom WirePlumber script that
+  ## handles audio routing in a platform-specific way. See
+  ## tests/examples/bt-pinephone.lua for an example.
+  bluez5.hw-offload-sco = true
+}
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/80-disable-logind.conf b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/80-disable-logind.conf
new file mode 100644
index 000000000..4255174ad
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/80-disable-logind.conf
@@ -0,0 +1,6 @@
+# Disabling seat monitoring via logind in the BlueZ monitor
+wireplumber.profiles = {
+  main = {
+    monitor.bluez.seat-monitoring = disabled
+  }
+}
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
new file mode 100644
index 000000000..e79e98cfe
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
@@ -0,0 +1,18 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append:imx-nxp-bsp = " file://51-bluez-imx.conf \
+                               file://80-disable-logind.conf \
+                               file://0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch \
+                             "
+do_install:append:imx-nxp-bsp () {
+    install -d ${D}${datadir}
+    # Install nxp configure file to /usr/share/wireplumber/wireplumber.conf.d
+    install -d ${D}${datadir}/wireplumber/wireplumber.conf.d
+    install -m 0644 ${UNPACKDIR}/51-bluez-imx.conf ${D}${datadir}/wireplumber/wireplumber.conf.d
+    install -m 0644 ${UNPACKDIR}/80-disable-logind.conf ${D}${datadir}/wireplumber/wireplumber.conf.d
+}
+FILES:${PN}:append = " ${datadir}/wireplumber/wireplumber.conf.d"
diff --git a/dynamic-layers/networking-layer/recipes-fsl/packagegroups/packagegroup-fsl-network.bbappend b/dynamic-layers/networking-layer/recipes-fsl/packagegroups/packagegroup-fsl-network.bbappend
new file mode 100644
index 000000000..8de766138
--- /dev/null
+++ b/dynamic-layers/networking-layer/recipes-fsl/packagegroups/packagegroup-fsl-network.bbappend
@@ -0,0 +1 @@
+NETWORK_TOOLS:append = " tcpdump"
diff --git a/recipes-devtools/utp-com/utp-com_git.bb b/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
index 364c91bcc..364c91bcc 100644
--- a/recipes-devtools/utp-com/utp-com_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
diff --git a/recipes-devtools/uuu/uuu_git.bb b/dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb
index 3af8bc569..3af8bc569 100644
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
index 724d0ff53..724d0ff53 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
new file mode 100644
index 000000000..534d37627
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
@@ -0,0 +1,23 @@
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Package group used by FSL Community to provide a set of benchmark applications."
+SUMMARY = "FSL Communtiy package group - tools/benchmark"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+RDEPENDS:${PN} = " \
+    lmbench \
+    bonnie++ \
+    dbench \
+    fio \
+    iozone3 \
+    iperf3 \
+    nbench-byte \
+    tiobench \
+    ${@bb.utils.contains('TUNE_FEATURES', 'neon',             'cpuburn-neon', \
+       bb.utils.contains('TUNE_FEATURES', 'cortexa53 crypto', 'cpuburn-neon', \
+                                                              '', d), d)} \
+"
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
new file mode 100644
index 000000000..2706dca97
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
@@ -0,0 +1,45 @@
+# Copyright (C) 2012-2014, 2016 Freescale Semiconductor
+# Copyright (C) 2015, 2016 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Packagegroup used by FSL Community to provide a set of packages and utilities \
+for hardware test."
+SUMMARY = "FSL Community packagegroup - tools/testapps"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+SOC_TOOLS_TEST = ""
+SOC_TOOLS_TEST:imx-nxp-bsp = "imx-test"
+SOC_TOOLS_TEST:imxgpu  = "imx-test imx-gpu-viv-demos"
+SOC_TOOLS_TEST:qoriq = "ceetm optee-test-qoriq"
+RDEPENDS:${PN} = " \
+    alsa-utils \
+    alsa-tools \
+    dosfstools \
+    evtest \
+    e2fsprogs-mke2fs \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'fsl-rc-local', '', d)} \
+    fbset \
+    i2c-tools \
+    iproute2 \
+    memtester \
+    python3-core \
+    python3-json \
+    python3-datetime \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'v4l-utils', '', d)} \
+    ethtool \
+    mtd-utils \
+    mtd-utils-ubifs \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3-demo', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                         'weston-examples', '', d)} \
+    ${SOC_TOOLS_TEST} \
+"
+RDEPENDS_IMX_TO_REMOVE = ""
+RDEPENDS_IMX_TO_REMOVE:imxgpu3d = ""
+RDEPENDS:${PN}:remove = "${RDEPENDS_IMX_TO_REMOVE}"
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend
new file mode 100644
index 000000000..88a16cb9d
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend
@@ -0,0 +1,2 @@
+# This is a header-only library, so the main package will be empty.
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
index b1b00623d..b1b00623d 100644
--- a/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
diff --git a/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
index 59da6ab32..59da6ab32 100644
--- a/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
diff --git a/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
index 46232ec5c..46232ec5c 100644
--- a/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
diff --git a/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
index 948a80faf..948a80faf 100644
--- a/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
diff --git a/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
index d56b8ae67..d56b8ae67 100644
--- a/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
diff --git a/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
index aa7d335ea..aa7d335ea 100644
--- a/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
diff --git a/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch
index c5a64387f..c5a64387f 100644
--- a/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch
diff --git a/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
index 5d88d1a6a..5d88d1a6a 100644
--- a/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
diff --git a/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
index 7b2c4100a..7b2c4100a 100644
--- a/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
diff --git a/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
index d39c05822..d39c05822 100644
--- a/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
diff --git a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
index ef7831a5f..ef7831a5f 100644
--- a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
diff --git a/recipes-support/opencv/opencv/download.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/download.patch
index 33ac48312..33ac48312 100644
--- a/recipes-support/opencv/opencv/download.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/download.patch
diff --git a/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
index 3538f24b3..3538f24b3 100644
--- a/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
index 0195bc61a..0195bc61a 100644
--- a/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
diff --git a/wic/imx-imx-boot-bootpart.wks.in b/files/wic/imx-imx-boot-bootpart.wks.in
index 46a2a0a68..46a2a0a68 100644
--- a/wic/imx-imx-boot-bootpart.wks.in
+++ b/files/wic/imx-imx-boot-bootpart.wks.in
diff --git a/wic/imx-imx-boot.wks.in b/files/wic/imx-imx-boot.wks.in
index fdb411803..fdb411803 100644
--- a/wic/imx-imx-boot.wks.in
+++ b/files/wic/imx-imx-boot.wks.in
diff --git a/wic/imx-uboot-bootpart.wks.in b/files/wic/imx-uboot-bootpart.wks.in
index 4959d02df..4959d02df 100644
--- a/wic/imx-uboot-bootpart.wks.in
+++ b/files/wic/imx-uboot-bootpart.wks.in
diff --git a/wic/imx-uboot-mxs-bootpart.wks.in b/files/wic/imx-uboot-mxs-bootpart.wks.in
index 175499d63..175499d63 100644
--- a/wic/imx-uboot-mxs-bootpart.wks.in
+++ b/files/wic/imx-uboot-mxs-bootpart.wks.in
diff --git a/wic/imx-uboot-mxs.wks.in b/files/wic/imx-uboot-mxs.wks.in
index 8d82b7b86..8d82b7b86 100644
--- a/wic/imx-uboot-mxs.wks.in
+++ b/files/wic/imx-uboot-mxs.wks.in
diff --git a/wic/imx-uboot-spl-bootpart.wks.in b/files/wic/imx-uboot-spl-bootpart.wks.in
index be0f0fe03..be0f0fe03 100644
--- a/wic/imx-uboot-spl-bootpart.wks.in
+++ b/files/wic/imx-uboot-spl-bootpart.wks.in
diff --git a/wic/imx-uboot-spl.wks.in b/files/wic/imx-uboot-spl.wks.in
index c6c9aaa2c..c6c9aaa2c 100644
--- a/wic/imx-uboot-spl.wks.in
+++ b/files/wic/imx-uboot-spl.wks.in
diff --git a/wic/imx-uboot.wks b/files/wic/imx-uboot.wks
index cde24798d..cde24798d 100644
--- a/wic/imx-uboot.wks
+++ b/files/wic/imx-uboot.wks
diff --git a/wic/ls104x-uboot-bootpart.wks.in b/files/wic/ls104x-uboot-bootpart.wks.in
index 8ca231c6b..8ca231c6b 100644
--- a/wic/ls104x-uboot-bootpart.wks.in
+++ b/files/wic/ls104x-uboot-bootpart.wks.in
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.5.bb
index f776e463d..0f6edf28b 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.5.bb
@@ -1,15 +1,15 @@
-# Copyright 2021-2025 NXP
+# Copyright 2021-2026 NXP
 SUMMARY = "NXP i.MX ELE firmware"
 DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "89161a8"
+IMX_SRCREV_ABBREV = "29313e0"
-SRC_URI[sha256sum] = "2d29f0a4de3662ba15f6a7d9069702d4eaed415d96a17f29d5b127f2c6fdd634"
+SRC_URI[sha256sum] = "3af1a5e1336ae3379cf573ccdf34fd8adec99005c4abb70ea0f14af3ac5fb1ae"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
@@ -17,10 +17,9 @@ do_compile[noexec] = "1"
 do_install() {
    install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
-    install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    for fw in ${SECO_FIRMWARE_NAME} ${SECOEXT_FIRMWARE_NAME}; do
-    if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
+        install -m 0644 ${S}/$fw ${D}${nonarch_base_libdir}/firmware/imx/ele
-        install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    done
-    fi
 }
 do_deploy () {
@@ -29,12 +28,7 @@ do_deploy () {
 }
 addtask deploy after do_install before do_build
-PACKAGES += "${PN}-ext"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
-ALLOW_EMPTY:${PN}-ext = "1"
-FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
-FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
 RREPLACES:${PN} = "firmware-sentinel"
 RPROVIDES:${PN} = "firmware-sentinel"
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.28.inc b/recipes-bsp/firmware-imx/firmware-imx-8.31.inc
index 63febc19b..efc895760 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.28.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.31.inc
@@ -1,16 +1,16 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2025 NXP
+# Copyright 2017-2026 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 HOMEPAGE = "https://www.nxp.com/"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 # Note: This .inc file is used from differently named recipes, so the package
 # name must be hard-coded, i.e., ${BPN} cannot be used.
 SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "994fa14"
+IMX_SRCREV_ABBREV = "4fa5b46"
-SRC_URI[sha256sum] = "55996f340e87825685a00cd309901189066ec9545ee607734f942c3cde4d69dc"
+SRC_URI[sha256sum] = "7f83731cae7056ea4007bf8f0b19734cd76d53affb258405c85223ba7ade5354"
 S = "${UNPACKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.28.bb b/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
index 2cd449165..0847a96c0 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.28.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2021,2024-2025 NXP
+# Copyright 2017-2021,2024-2026 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SUMMARY = "Freescale i.MX firmware"
 DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
@@ -65,6 +65,10 @@ do_install() {
    mv ${D}${nonarch_base_libdir}/firmware/vpu/vpu_fw_imx8* ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
    # Install i.MX 95 VPU firmware
    install -m 0644 ${S}/firmware/vpu/wave633c_codec_fw.bin ${D}${nonarch_base_libdir}/firmware
+    # Install i.MX 952 VPU firmware
+    install -d ${D}${nonarch_base_libdir}/firmware/cnm
+    install -m 0644 ${S}/firmware/vpu/coda980_enc_fw.bin ${D}${nonarch_base_libdir}/firmware/cnm
+    install -m 0644 ${S}/firmware/vpu/wave511_dec_fw.bin ${D}${nonarch_base_libdir}/firmware/cnm
 }
 #
@@ -157,7 +161,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu
 # is empty.
 # Therefore, we opt-out from producing -dev package here, since also for firmware
 # files it makes no sense.
-PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-wave"
+PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-coda980 ${PN}-vpu-wave511 ${PN}-vpu-wave"
 FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
 FILES:${PN}-hdmi = " \
@@ -166,6 +170,8 @@ FILES:${PN}-hdmi = " \
    ${nonarch_base_libdir}/firmware/dpfw.bin \
 "
 FILES:${PN}-vpu-amphion = "${nonarch_base_libdir}/firmware/amphion/vpu/*"
+FILES:${PN}-vpu-coda980 = "${nonarch_base_libdir}/firmware/cnm/coda980_enc_fw.bin"
+FILES:${PN}-vpu-wave511 = "${nonarch_base_libdir}/firmware/cnm/wave511_dec_fw.bin"
 FILES:${PN}-vpu-wave = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin"
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index d0607a093..58b69bae8 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -10,9 +10,8 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bc649096ad3928ec06a8713b8d787eac"
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.12.49_2.2.0"
+SRCBRANCH = "lf-6.18.2_1.0.0"
-SRCREV = "8c9b278016c97527b285f2fcbe53c2d428eb171d"
+SRCREV = "d7e4bb37b45bbf93faf888e0ca6763a29e28054a"
 inherit allarch
@@ -28,15 +27,13 @@ do_install() {
    install -d ${D}${nonarch_base_libdir}/firmware/nxp
    oe_runmake install INSTALLDIR=${D}${nonarch_base_libdir}/firmware/nxp
-    # Upstream SDIO8997 and IW416 driver firmwares are located on mrvl folder
+    # Upstream ISDIO8997 and W416 driver firmwares are located on mrvl folder
    install -d ${D}${nonarch_base_libdir}/firmware/mrvl
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd9098_wlan_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio9098_wlan_v1.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart9098_combo_v1.bin
-    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd8997_wlan_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio8997_wlan_v4.bin
-    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduartiw416_combo.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin
 }
@@ -47,8 +44,6 @@ PACKAGES =+ " \
    \
    ${PN}-nxp-common \
    ${PN}-nxp8987-sdio \
-    ${PN}-nxp8997-common \
-    ${PN}-nxp8997-pcie \
    ${PN}-nxp8997-sdio \
    ${PN}-nxp9098-common \
    ${PN}-nxp9098-pcie \
@@ -70,7 +65,6 @@ RDEPENDS:${PN}-all-sdio = " \
 "
 RDEPENDS:${PN}-all-pcie = " \
-    ${PN}-nxp8997-pcie \
    ${PN}-nxp9098-pcie \
    ${PN}-nxpaw693-pcie \
 "
@@ -92,32 +86,9 @@ RPROVIDES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RREPLACES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
-FILES:${PN}-nxp8997-common = " \
-    ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \
-    ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \
-    ${nonarch_base_libdir}/firmware/nxp/uart8997_bt_v4.bin \
-"
-RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common"
-RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
-RREPLACES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
-RCONFLICTS:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
-FILES:${PN}-nxp8997-pcie = " \
-    ${nonarch_base_libdir}/firmware/nxp/pci*8997* \
-"
-RDEPENDS:${PN}-nxp8997-pcie += "${PN}-nxp8997-common"
-RPROVIDES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
-RREPLACES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
-RCONFLICTS:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
 FILES:${PN}-nxp8997-sdio = " \
    ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
-    ${nonarch_base_libdir}/firmware/nxp/sd*8997* \
 "
-RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common"
-RPROVIDES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
-RREPLACES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
-RCONFLICTS:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
 FILES:${PN}-nxp9098-common = " \
    ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
@@ -178,11 +149,11 @@ FILES:${PN}-nxpiw610-usb += " \
 RDEPENDS:${PN}-nxpiw610-usb += "${PN}-nxp-common"
 FILES:${PN}-nxpiw612-sdio = " \
-    ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \
    ${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/sduart_nw61x_*.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_*.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_*.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/firmware-imx/imx-boot-firmware-files_8.28.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.31.bb
index 4c0d51c8a..53edf58bd 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.28.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.31.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 NXP
+# Copyright (C) 2018-2026 NXP
 SUMMARY = "Freescale i.MX Firmware files used for boot"
 require firmware-imx-${PV}.inc
diff --git a/recipes-bsp/imx-atf/imx-atf/0001-scmi-imx9-Remove-unused-tmp-pointer.patch b/recipes-bsp/imx-atf/imx-atf/0001-scmi-imx9-Remove-unused-tmp-pointer.patch
new file mode 100644
index 000000000..ce801061a
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf/0001-scmi-imx9-Remove-unused-tmp-pointer.patch
@@ -0,0 +1,38 @@
+From 455e501513345b98ff93d9c214f2f17629edd318 Mon Sep 17 00:00:00 2001
+From: Franz Schnyder <franz.schnyder@toradex.com>
+Date: Fri, 29 May 2026 11:04:45 +0200
+Subject: [PATCH] scmi: imx9: Remove unused tmp pointer
+The scmi_per_lpm_mode_set function declares a tmp pointer but is never
+read. The newer GCC version 16.1.0 treats the unused pointer as
+-Wunused-but-set-variable. With -Werror, this breaks the build.
+Upstream-Status: Pending
+Signed-off-by: Franz Schnyder <franz.schnyder@toradex.com>
+---
+ drivers/arm/css/scmi/vendor/scmi_imx9.c | 2 --
+ 1 file changed, 2 deletions(-)
+diff --git a/drivers/arm/css/scmi/vendor/scmi_imx9.c b/drivers/arm/css/scmi/vendor/scmi_imx9.c
+index 8319eeb69..3a0f5b95b 100644
+--- a/drivers/arm/css/scmi/vendor/scmi_imx9.c
+++ b/drivers/arm/css/scmi/vendor/scmi_imx9.c
+@@ -400,7 +400,6 @@ int scmi_per_lpm_mode_set(void *p, uint32_t cpu_id, uint32_t num_configs,
+        unsigned int token = 0;
+        int ret;
+        scmi_channel_t *ch = (scmi_channel_t *)p;
+-       struct scmi_per_lpm_config *tmp = cfg;
+ 
+        validate_scmi_channel(ch);
+ 
+@@ -428,7 +427,6 @@ int scmi_per_lpm_mode_set(void *p, uint32_t cpu_id, uint32_t num_configs,
+ 
+                if (num_configs > MAX_PER_LPI_CONFIGS_PER_CMD) {
+                        num_configs -= MAX_PER_LPI_CONFIGS_PER_CMD;
+-                       tmp += MAX_PER_LPI_CONFIGS_PER_CMD;
+                } else {
+                        break;
+                }
+-- 
+2.43.0
diff --git a/recipes-bsp/imx-atf/imx-atf_2.12.bb b/recipes-bsp/imx-atf/imx-atf_2.12.bb
index ba494594f..7cef23416 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.12.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.12.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2025 NXP
+# Copyright (C) 2017-2026 NXP
 DESCRIPTION = "i.MX ARM Trusted Firmware"
 SECTION = "BSP"
@@ -7,13 +7,23 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
 PV .= "+git${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
-           file://0001-imx93-trdc-Fix-header-guard.patch"
+           file://0001-scmi-imx9-Remove-unused-tmp-pointer.patch \
+"
+ATF_SRC ?= "git://github.com/nxp-imx/imx-atf.git;protocol=https"
 SRCBRANCH = "lf_v2.12"
-SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
+SRCREV = "4a2e9ef5f9f185bda68470b46365add008903b8c"
 inherit deploy
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} \
+    ${@bb.utils.filter('MACHINE_FEATURES', 'optee', d)}"
+PACKAGECONFIG[crrm] = "IMX_CRRM=1"
+PACKAGECONFIG[debug] = "DEBUG=1,DEBUG=0"
+PACKAGECONFIG[optee] = "SPD=opteed"
 ATF_PLATFORM ??= "INVALID"
 # FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART
@@ -23,8 +33,9 @@ ATF_BOOT_UART_BASE ?= ""
 EXTRA_OEMAKE += " \
    CROSS_COMPILE=${TARGET_PREFIX} \
    PLAT=${ATF_PLATFORM} \
+    ${PACKAGECONFIG_CONFARGS} \
+    bl31 \
 "
 # Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application
 CFLAGS[unexport] = "1"
 LDFLAGS[unexport] = "1"
@@ -38,8 +49,6 @@ DEPENDS = "virtual/cross-cc"
 # Bring in clang compiler if using clang as default
 DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}"
-BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
 # CC and LD introduce arguments which conflict with those otherwise provided by
 # this recipe. The heads of these variables excluding those arguments
 # are therefore used instead.
@@ -58,23 +67,19 @@ EXTRA_OEMAKE += 'IMX_BOOT_UART_BASE=${ATF_BOOT_UART_BASE}'
 do_configure[noexec] = "1"
-do_compile() {
-    # Clear LDFLAGS to avoid the option -Wl recognize issue
-    oe_runmake bl31
-    if ${BUILD_OPTEE}; then
-        oe_runmake clean BUILD_BASE=build-optee
-        oe_runmake BUILD_BASE=build-optee SPD=opteed bl31
-    fi
-}
 do_install[noexec] = "1"
+ANNOTATED_NAME        = "bl31-${ATF_PLATFORM}.bin"
+ANNOTATED_NAME:append = "${@bb.utils.contains('PACKAGECONFIG',  'crrm',  '-crrm', '', d)}"
+ANNOTATED_NAME:append = "${@bb.utils.contains('PACKAGECONFIG', 'optee', '-optee', '', d)}"
 addtask deploy after do_compile
 do_deploy() {
-    install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin
+    OUTPUT_FOLDER="${@bb.utils.contains('PACKAGECONFIG', 'debug', 'debug', 'release', d)}"
-    if ${BUILD_OPTEE}; then
+    for deploydir in ${DEPLOYDIR} ${DEPLOYDIR}/imx-boot-tools; do
-        install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin-optee
+        install -Dm 0644 ${S}/build/${ATF_PLATFORM}/${OUTPUT_FOLDER}/bl31.bin $deploydir/${ANNOTATED_NAME}
-    fi
+    done
+    ln -sf ${ANNOTATED_NAME} ${DEPLOYDIR}/bl31.bin
 }
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 120f0594e..fcc8f84b3 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2024 NXP
+# Copyright (C) 2017-2024,2026 NXP
 require imx-mkimage_git.inc
@@ -7,19 +7,30 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "BSP"
-inherit use-imx-security-controller-firmware uboot-config
+DEPENDS += "xxd-native"
+DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native u-boot-mkeficapsule-native"
+DEPENDS:append:mx93-generic-bsp = " u-boot-mkimage-native dtc-native u-boot-mkeficapsule-native"
+DEPENDS:append:mx95-generic-bsp = " u-boot-mkeficapsule-native"
+# This package aggregates output deployed by other packages,
+# so set the appropriate dependencies
 DEPENDS += " \
-    u-boot \
+    virtual/bootloader \
    ${IMX_EXTRA_FIRMWARE} \
    imx-atf \
+    ${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${CRRM_DEPLOY_DEPENDS}', '', d)} \
    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os', '', d)} \
 "
-# xxd is a dependency of fspi_packer.sh
-DEPENDS += "xxd-native"
-DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native"
-DEPENDS:append:mx93-generic-bsp = " u-boot-mkimage-native dtc-native"
+do_compile[deptask] = "do_deploy"
+do_compile[depends] += "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${CRRM_INITRAMFS}:do_build', '', d)}"
+CRRM_DEPLOY_DEPENDS ?= " \
+    virtual/kernel \
+    ${CRRM_INITRAMFS}"
+CRRM_INITRAMFS ??= "imx-image-crrm-initramfs"
+inherit use-imx-security-controller-firmware uboot-config
 inherit deploy uuu_bootloader_tag
 UUU_BOOTLOADER = "imx-boot"
@@ -27,21 +38,12 @@ UUU_BOOTLOADER = "imx-boot"
 # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build
 CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}"
-# This package aggregates output deployed by other packages,
-# so set the appropriate dependencies
-do_compile[depends] += " \
-    virtual/bootloader:do_deploy \
-    ${@' '.join('%s:do_deploy' % r for r in '${IMX_EXTRA_FIRMWARE}'.split() )} \
-    imx-atf:do_deploy \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os:do_deploy', '', d)} \
-"
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
-OEI_ENABLE = "${@bb.utils.contains('DEPENDS', 'virtual/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('UBOOT_CONFIG', 'crrm', '-crrm', '', d)}"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 BOOT_VARIANT ?= ""
@@ -80,21 +82,35 @@ REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 MKIMAGE_EXTRA_ARGS ?= ""
 MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= " \
-    OEI=${OEI_ENABLE} \
+    OEI=YES \
    LPDDR_TYPE=${DDR_TYPE} \
    MSEL=${MSEL_TYPE} \
 "
 MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
-    OEI=${OEI_ENABLE} \
+    OEI=YES \
    LPDDR_TYPE=${DDR_TYPE} \
    ${@'LPDDR_FW_VERSION='+d.getVar('LPDDR_FW_VERSION') if d.getVar('LPDDR_FW_VERSION') else ''} \
    ${@bb.utils.contains('SYSTEM_MANAGER_CONFIG', 'mx95alt', 'MSEL=1', '', d)}"
+MKIMAGE_EXTRA_ARGS:imx95-19x19-lpddr5-frdm-pro ?= " \
+    ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
+    QSPI_HEADER=./scripts/fspi_header-W25Q512NWEIQ"
 MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \
    ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
    QSPI_HEADER=./scripts/fspi_header_133"
+MKIMAGE_EXTRA_ARGS:imx95-a1-19x19-verdin ?= " \
+    ${MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin} \
+"
 UBOOT_DTB_BINARY ?= "u-boot.dtb"
+CRRM_FILES = " \
+    ${KERNEL_IMAGETYPE}.gz \
+    ${KERNEL_IMAGETYPE}_crrm.gz \
+    ${KERNEL_DEVICETREE_BASENAME}.dtb \
+    ${KERNEL_DEVICETREE_BASENAME}-crrm.dtb \
+    ${CRRM_INITRAMFS}-${MACHINE}.cpio.zst.u-boot"
 compile_mx8m() {
    bbnote 8MQ/8MM/8MN/8MP boot binary build
    for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
@@ -188,6 +204,7 @@ compile_mx943() {
    bbnote i.MX 943 boot binary build
    compile_mx93
+    cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
 }
@@ -196,6 +213,7 @@ compile_mx95() {
    bbnote i.MX 95 boot binary build
    compile_mx93
+    cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
 }
@@ -210,9 +228,13 @@ do_compile() {
            cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}/tee.bin-stmm
        fi
    fi
-    # Copy OEI firmware to SoC target folder to mkimage
+    # Copy CRRM binaries to SoC target folder to mkimage
-    if [ "${OEI_ENABLE}" = "YES" ]; then
+    if [ ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} ]; then
-        cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
+        for f in ${CRRM_FILES}; do
+            cp ${DEPLOY_DIR_IMAGE}/$f ${BOOT_STAGING}/$f
+        done
+        ln -sf ${CRRM_INITRAMFS}-${MACHINE}.cpio.zst.u-boot \
+            ${BOOT_STAGING}/initramfs.cpio.zst.u-boot
    fi
    for type in ${UBOOT_CONFIG}; do
@@ -250,11 +272,11 @@ do_compile() {
                        ;;
                    *stmm_capsule)
                        # target for flash_evk_stmm_capsule or
-                        # flash_singleboot_stmm_capsule
+                        # flash_singleboot_stmm_capsule or flash_lpboot_sm_all_stmm_capsule
                        cp ${RECIPE_SYSROOT_NATIVE}/${bindir}/mkeficapsule ${BOOT_STAGING}
-                        bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${target}"
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${MKIMAGE_EXTRA_ARGS} ${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}
+                        make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm ${MKIMAGE_EXTRA_ARGS} dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target}
                        ;;
                    *)
                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} ${target}"
@@ -365,12 +387,14 @@ deploy_mx93() {
 deploy_mx943() {
    deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
 }
 deploy_mx95() {
    deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
 }
@@ -383,9 +407,12 @@ do_deploy() {
       install -m 0644 ${DEPLOY_DIR_IMAGE}/tee.bin ${DEPLOYDIR}/${BOOT_TOOLS}
    fi
-    # copy oei to deploy path
+    # copy crrm to deploy path
-    if [ "${OEI_ENABLE}" = "YES" ]; then
+    if [ ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} ]; then
-        install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
+        for f in ${CRRM_FILES}; do
+            cp ${DEPLOY_DIR_IMAGE}/$f                        ${DEPLOYDIR}/${BOOT_TOOLS}/$f
+        done
+        ln -s ${CRRM_INITRAMFS}-${MACHINE}.cpio.zst.u-boot   ${DEPLOYDIR}/${BOOT_TOOLS}/initramfs.cpio.zst.u-boot
    fi
    # copy makefile (soc.mak) for reference
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
index f95f2a2ba..282bc45a1 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright (C) 2017-2022 NXP
+# Copyright 2017-2022,2026 NXP
 require imx-mkimage_git.inc
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index a14d98241..4a4efae01 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,12 +1,13 @@
-# Copyright 2017-2025 NXP
+# Copyright 2017-2026 NXP
+ 
 DEPENDS = "zlib-native openssl-native"
-SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH} \
           file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.12.20_2.0.0"
+IMX_MKIMAGE_SRC ?= "git://github.com/nxp-imx/imx-mkimage.git;protocol=https"
-SRCREV = "4c2e5b25232f5aa003976ddca9d1d2fb9667beb1"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "c0debd7c0b4a125bd3ca66bc68f1915882b2bb62"
 BOOT_TOOLS = "imx-boot-tools"
 SYSROOT_DIRS += "/boot"
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
index 2710297d6..a9d021b6c 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
@@ -17,7 +17,10 @@ S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 do_compile[noexec] = "1"
-do_install[noexec] = "1"
+do_install:append() {
+    install -d ${D}${base_libdir}/firmware/${PN}
+    install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${D}${base_libdir}/firmware/${PN}
+}
 addtask deploy after do_install
 do_deploy () {
@@ -25,4 +28,5 @@ do_deploy () {
    install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
 }
+FILES:${PN} = "/"
 COMPATIBLE_MACHINE = "(mx8qm-generic-bsp|mx8qxp-generic-bsp|mx8dxl-generic-bsp|mx8dx-generic-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
deleted file mode 100644
index 8d017ab71..000000000
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e7f6097c9e7cb30f130502cc4804e1a1b01342de Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 16:13:38 +0000
-Subject: [PATCH] base_type.h: make header compatible with c23
-With C23 bool, true and false are built in keywords and cannot be
-redefined.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- usr/include/hantro_VC8000E_enc/base_type.h | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/usr/include/hantro_VC8000E_enc/base_type.h b/usr/include/hantro_VC8000E_enc/base_type.h
-index 282fc81b8eba..af4212eed2bd 100755
--- a/usr/include/hantro_VC8000E_enc/base_type.h
-+++ b/usr/include/hantro_VC8000E_enc/base_type.h
-@@ -67,6 +67,9 @@ typedef       unsigned int        UInt;
- #define HANTRO_FALSE 0
- #define HANTRO_TRUE  1
- 
-+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
-+/* bool, true and false are keywords.  */
-+#else
- #ifndef bool
- typedef enum
- {
-@@ -74,6 +77,7 @@ typedef enum
-   true  = HANTRO_TRUE
- } bool;
- #endif
-+#endif
- 
- enum
- {
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
index 68c2a4979..528b05e17 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
@@ -2,18 +2,14 @@
 DESCRIPTION = "i.MX VC8000E Encoder library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 inherit fsl-eula-unpack
-SRC_URI = " \
+SRC_URI = " ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+IMX_SRCREV_ABBREV = "5e18a84"
-    file://0001-base_type.h-make-header-compatible-with-c23.patch \
-"
-IMX_SRCREV_ABBREV = "c0244a1"
-SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
+SRC_URI[sha256sum] = "04d2a9c5c75804a11a4500a0133dfc7d8e84f74254cee52c42075f5ecc229550"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 # SCR is the location and name of the Software Content Register file
@@ -36,4 +32,5 @@ do_install () {
 FILES:${PN} = "/"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
index 940b9fa41..d24ab66ea 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
@@ -7,9 +7,9 @@ DEPENDS = "imx-vpu-hantro"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.tar.gz"
-IMX_SRCREV_ABBREV = "3200e68"
+IMX_SRCREV_ABBREV = "a4cefcc"
-SRC_URI[sha256sum] = "e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535"
+SRC_URI[sha256sum] = "629087dd3e9ae0f4c00a75a2f2b715b7e24918b7401b26137e9270d6ac0fa90c"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
deleted file mode 100644
index bbfec172a..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e39a6602817e4221ae09ac3d520ca6a0d94814dc Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 16:13:38 +0000
-Subject: [PATCH] basetype.h: make header compatible with c23
-With C23 bool, true and false are built in keywords and cannot be
-redefined.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- h1_encoder/software/inc/basetype.h | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/h1_encoder/software/inc/basetype.h b/h1_encoder/software/inc/basetype.h
-index 55e46a195b3b..6655ec54481b 100755
--- a/h1_encoder/software/inc/basetype.h
-+++ b/h1_encoder/software/inc/basetype.h
-@@ -66,12 +66,16 @@ typedef size_t ptr_t;
- #define PRT_PTR "x"
- #endif
- 
-+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
-+/* bool, true and false are keywords.  */
-+#else
- #ifndef __cplusplus
- typedef enum {
-         false   = 0,
-         true    = 1
- } bool;
- #endif
-+#endif
- 
- #else /* __symbian__ or __win__ or whatever, customize it to suit well */
- 
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
deleted file mode 100644
index da1af2b9c..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 0c5bdd12a6f3ba73e605656828bf429966a997ef Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 13:25:26 +0000
-Subject: [PATCH] test: md5: convert to ansi c
-GCC 15 no longer likes this K&R style function declarations.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- decoder_sw/software/test/common/swhw/md5.c | 15 +++++----------
- decoder_sw/software/test/common/swhw/md5.h |  8 ++++----
- 2 files changed, 9 insertions(+), 14 deletions(-)
-diff --git a/decoder_sw/software/test/common/swhw/md5.c b/decoder_sw/software/test/common/swhw/md5.c
-index c3334bf751fd..20014fbdf268 100755
--- a/decoder_sw/software/test/common/swhw/md5.c
-+++ b/decoder_sw/software/test/common/swhw/md5.c
-@@ -42,8 +42,7 @@
- /*
-  * Note: this code is harmless on little-endian machines.
-  */
-void ByteReverse(buf, longs) unsigned char *buf;
-unsigned longs;
-+void ByteReverse(unsigned char *buf, unsigned longs)
- {
-   uint32 t;
-   do {
-@@ -59,7 +58,7 @@ unsigned longs;
-  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-  * initialization constants.
-  */
-void MD5Init(ctx) struct MD5Context *ctx;
-+void MD5Init(struct MD5Context *ctx)
- {
-   ctx->buf[0] = 0x67452301;
-   ctx->buf[1] = 0xefcdab89;
-@@ -74,9 +73,7 @@ void MD5Init(ctx) struct MD5Context *ctx;
-  * Update context to reflect the concatenation of another buffer full
-  * of bytes.
-  */
-void MD5Update(ctx, buf, len) struct MD5Context *ctx;
-unsigned char *buf;
-unsigned len;
-+void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len)
- {
-   uint32 t;
- 
-@@ -124,8 +121,7 @@ unsigned len;
-  * Final wrapup - pad to 64-byte boundary with the bit pattern
-  * 1 0* (64-bit count of bits processed, MSB-first)
-  */
-void MD5Final(digest, ctx) unsigned char digest[16];
-struct MD5Context *ctx;
-+void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
- {
-   unsigned count;
-   unsigned char *p;
-@@ -186,8 +182,7 @@ struct MD5Context *ctx;
-  * reflect the addition of 16 longwords of new data.  MD5Update blocks
-  * the data and converts bytes into longwords for this routine.
-  */
-void MD5Transform(buf, in) uint32 buf[4];
-uint32 in[16];
-+void MD5Transform(uint32 buf[4], uint32 in[16])
- {
-   register uint32 a, b, c, d;
- 
-diff --git a/decoder_sw/software/test/common/swhw/md5.h b/decoder_sw/software/test/common/swhw/md5.h
-index 516400236606..c1d773093b66 100755
--- a/decoder_sw/software/test/common/swhw/md5.h
-+++ b/decoder_sw/software/test/common/swhw/md5.h
-@@ -76,10 +76,10 @@ struct MD5Context {
-   unsigned char in[64];
- };
- 
-extern void MD5Init();
-extern void MD5Update();
-extern void MD5Final();
-extern void MD5Transform();
-+extern void MD5Init(struct MD5Context *ctx);
-+extern void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len);
-+extern void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
-+extern void MD5Transform(uint32 buf[4], uint32 in[16]);
- 
- /*
-  * This is needed to make RSAREF happy on some MS-DOS compilers.
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
index d766e0191..e5113f1c1 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
@@ -1,19 +1,17 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2020,2026 NXP
 DESCRIPTION = "i.MX Hantro VPU library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 PROVIDES = "virtual/imxvpu"
 SRC_URI = " \
    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
-    file://0001-test-md5-convert-to-ansi-c.patch \
-    file://0001-basetype.h-make-header-compatible-with-c23.patch \
 "
-IMX_SRCREV_ABBREV = "194a305"
+IMX_SRCREV_ABBREV = "52c7e45"
-SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7"
+SRC_URI[sha256sum] = "cdfb28cdec4e26ef84ee8c54be89a1da269eaeb4b51eafe689eb084ac20c7d84"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
@@ -43,7 +41,5 @@ do_install () {
 FILES:${PN} += "/unit_tests"
-RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
deleted file mode 100644
index 012e1f2b7..000000000
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2020-2024 NXP
-DESCRIPTION = "Basler camera binary drivers"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-IMX_SRCREV_ABBREV = "dd86758"
-inherit fsl-eula-unpack
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[sha256sum] = "aa86adeb0c53c3306f7e1c004ffa78ebb7db3e9136c78759e4029b4b5e1b1a64"
-S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
-do_compile[noexec] = "1"
-do_install() {
-    oe_runmake install INSTALL_DIR=${D}
-    dest_dir=${D}/opt/imx8-isp/bin
-    install -d ${D}/${libdir}
-    install -d $dest_dir
-    cp -r ${S}/opt/imx8-isp/bin/* $dest_dir
-    cp -r ${S}/usr/lib/* ${D}/${libdir}
-}
-SYSTEMD_AUTO_ENABLE = "enable"
-FILES:${PN} = "${libdir} /opt"
-INSANE_SKIP:${PN} = "already-stripped"
-RDEPENDS:${PN} += "isp-imx"
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
new file mode 100644
index 000000000..11580dfd2
--- /dev/null
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
@@ -0,0 +1,29 @@
+# Copyright 2020-2024 NXP
+DESCRIPTION = "Basler camera binary drivers"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+IMX_SRCREV_ABBREV = "dd86758"
+inherit fsl-eula-unpack
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI[sha256sum] = "4c3cfc96833a7d8462f71589152ef7f9c8fcc9badbb925bbc120431f8c5ee3b5"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+do_compile[noexec] = "1"
+do_install() {
+    oe_runmake install INSTALL_DIR=${D}
+}
+SYSTEMD_AUTO_ENABLE = "enable"
+FILES:${PN} = "${libdir} /opt"
+INSANE_SKIP:${PN} = "already-stripped"
+RDEPENDS:${PN} += "isp-imx"
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
index 617abde6f..930119261 100644
--- a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
+++ b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
@@ -1,7 +1,7 @@
-From d24c74528fefd1316f1633f0a7f1a5acea40454f Mon Sep 17 00:00:00 2001
+From 3443f18dc9ab8950071d6299c7a5da86055f3318 Mon Sep 17 00:00:00 2001
 From: Max Krummenacher <max.krummenacher@toradex.com>
 Date: Thu, 19 Jan 2023 15:51:24 +0000
-Subject: [PATCH 1/5] isp-imx: start_isp: don't report error if no camera is
+Subject: [PATCH] isp-imx: start_isp: don't report error if no camera is
 configured
 The script currently returns '6' when no known camera is configured
@@ -17,10 +17,10 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/imx/start_isp.sh b/imx/start_isp.sh
-index d544b4ca2a57..22e7783437d6 100755
+index 95cbc19..d603f8f 100755
 --- a/imx/start_isp.sh
 +++ b/imx/start_isp.sh
-@@ -72,5 +72,5 @@ elif [ $NR_DEVICE_TREE_OS08A20 -eq 2 ]; then
+@@ -74,5 +74,5 @@ elif [ $NR_DEVICE_TREE_OS08A20 -eq 2 ]; then
 else
        # no device tree found exit with code no device or address
        echo "No device tree found for Basler camera or os08a20, check dtb file!" >&2
@@ -28,5 +28,4 @@ index d544b4ca2a57..22e7783437d6 100755
 +       exit 0
 fi
 -- 
-2.42.0
+2.35.3
diff --git a/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch b/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch
deleted file mode 100644
index 38b3b6b02..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 5b69b60bd4d0d5ed1474c6457561d48cdbabc778 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 09:19:58 +0000
-Subject: [PATCH 2/5] appshell: cmake: bump min version to 3.5
-CMake 4 no longer supports min version set to before 3.5
-|  CMake Error at CMakeLists.txt:28 (cmake_minimum_required):
-|    Compatibility with CMake < 3.5 has been removed from CMake.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- appshell/CMakeLists.txt                        | 2 +-
- appshell/display/CMakeLists.txt                | 2 +-
- appshell/display/wayland-client/CMakeLists.txt | 2 +-
- appshell/v4l_drm_test/CMakeLists.txt           | 2 +-
- appshell/vvext/CMakeLists.txt                  | 2 +-
- appshell/yuv/CMakeLists.txt                    | 2 +-
- units/CMakeLists.txt                           | 2 +-
- units/isi/CMakeLists.txt                       | 2 +-
- units/isi/drv/OS08a20/CMakeLists.txt           | 2 +-
- units/isi/drv/OS08a20/calib/CMakeLists.txt     | 2 +-
- 10 files changed, 10 insertions(+), 10 deletions(-)
-diff --git a/appshell/CMakeLists.txt b/appshell/CMakeLists.txt
-index 22092ce975b5..cf14e254c812 100644
--- a/appshell/CMakeLists.txt
-+++ b/appshell/CMakeLists.txt
-@@ -25,7 +25,7 @@
- # *****************************************************************************/
- 
- 
-cmake_minimum_required(VERSION 3.1.0)
-+cmake_minimum_required(VERSION 3.5.0)
- project(ISP_APP_SHELL)
- 
- if(DEFINED QTLESS)
-diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
-index 491f086adf55..458a46b165b4 100755
--- a/appshell/display/CMakeLists.txt
-+++ b/appshell/display/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.6)
- 
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
- 
-diff --git a/appshell/display/wayland-client/CMakeLists.txt b/appshell/display/wayland-client/CMakeLists.txt
-index 78247528b0e4..0639d79d8346 100644
--- a/appshell/display/wayland-client/CMakeLists.txt
-+++ b/appshell/display/wayland-client/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.6)
- 
- set(WAYLAND_XML_PRIFIX ${SDKTARGETSYSROOT}/usr/share/wayland-protocols)
- set(GEN_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/display/wayland-client)
-diff --git a/appshell/v4l_drm_test/CMakeLists.txt b/appshell/v4l_drm_test/CMakeLists.txt
-index cf4685c84204..309e5d465e99 100755
--- a/appshell/v4l_drm_test/CMakeLists.txt
-+++ b/appshell/v4l_drm_test/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- project(ISP_V4L_DRM_TEST)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-diff --git a/appshell/vvext/CMakeLists.txt b/appshell/vvext/CMakeLists.txt
-index a5d6c12929fa..63c1eb5f7073 100755
--- a/appshell/vvext/CMakeLists.txt
-+++ b/appshell/vvext/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- project(ISP_V4L_DRM_TEST)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-diff --git a/appshell/yuv/CMakeLists.txt b/appshell/yuv/CMakeLists.txt
-index 131766fcb5d4..0f3591918e08 100755
--- a/appshell/yuv/CMakeLists.txt
-+++ b/appshell/yuv/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- set (CMAKE_CXX_FLAGS_DEBUG "")
- set (CMAKE_C_FLAGS_DEBUG "")
- 
-diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt
-index 37fa65ed4ea8..10abbef1c16c 100755
--- a/units/CMakeLists.txt
-+++ b/units/CMakeLists.txt
-@@ -24,7 +24,7 @@
- # *
- # *****************************************************************************/
- 
-cmake_minimum_required(VERSION 3.1.0)
-+cmake_minimum_required(VERSION 3.5.0)
- project(ISPcore_SW_STACK)
- if( NOT DEFINED APPSHELL_TOP_COMPILE)
- 
-diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
-index a91699b4a1a5..ea01aa7d9424 100755
--- a/units/isi/CMakeLists.txt
-+++ b/units/isi/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- # define module name
- set (module isi)
-diff --git a/units/isi/drv/OS08a20/CMakeLists.txt b/units/isi/drv/OS08a20/CMakeLists.txt
-index d27dc97f7945..12c6e9ef993a 100755
--- a/units/isi/drv/OS08a20/CMakeLists.txt
-+++ b/units/isi/drv/OS08a20/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- # define module name & interface version
- set (module os08a20)
-diff --git a/units/isi/drv/OS08a20/calib/CMakeLists.txt b/units/isi/drv/OS08a20/calib/CMakeLists.txt
-index b44b08248135..18119086b967 100755
--- a/units/isi/drv/OS08a20/calib/CMakeLists.txt
-+++ b/units/isi/drv/OS08a20/calib/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- # use upper level module name
- 
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch b/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch
deleted file mode 100644
index f11deb758..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From db07010535d47d7d7eaf3865d97dcec045e19930 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 09:57:22 +0000
-Subject: [PATCH 3/5] appshell: cmake: drop deprecated use of
- target_link_libraries
-Works around:
-| CMake Error at display/CMakeLists.txt:48 (target_link_libraries):
-|   Cannot specify link libraries for target "wayland-client" which is not
-|   built by this project.
-caused by CMake 4 deprecating https://cmake.org/cmake/help/v3.5/policy/CMP0016.html
-CMP0016 states that the command is silently ignored, thus drop it.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- appshell/display/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
-index 458a46b165b4..160755312368 100755
--- a/appshell/display/CMakeLists.txt
-+++ b/appshell/display/CMakeLists.txt
-@@ -43,7 +43,6 @@ if (WAYLAND_SUPPORT)
-     file(GLOB pub_headers *.h)
-     file(GLOB libsources *.cpp ./wayland-client/*.c)
-     include_directories(./wayland-client)
-    target_link_libraries(wayland-client)
- else (WAYLAND_SUPPORT)
-     file(GLOB pub_headers *.h)
-     file(GLOB libsources *.cpp)
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch b/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch
deleted file mode 100644
index 087f24090..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d7e06f57c067e50d86369577b8dc3bccdde6fd40 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 10:44:40 +0000
-Subject: [PATCH 4/5] units/targets.cmake: fix check if a target exists
-| CMake Error at units/targets.cmake:35 (get_target_property):
-|   get_target_property() called with non-existent target "lib".
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- units/targets.cmake | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-diff --git a/units/targets.cmake b/units/targets.cmake
-index 663a024d9129..d78dbf8b8a45 100755
--- a/units/targets.cmake
-+++ b/units/targets.cmake
-@@ -32,8 +32,7 @@ add_dependencies(create_alldir ${module}_create_dir)
- # Settings for target LIB
- ###############################################################################
- # check if lib target already exists and create it, this is to assure that only one target called lib will be generated
-get_target_property(LIB_TARGET lib TYPE)
-if(NOT LIB_TARGET)
-+if(NOT TARGET lib)
-     add_custom_target(lib)
- endif()
- # the library itself is a dependency for the target lib
-@@ -83,8 +82,7 @@ if(HAVE_PUBLIC_HEADERS)
- endif()
- 
- # check if lib_install target already exists and create it
-get_target_property(LIB_INSTALL_TARGET lib_install TYPE)
-if(NOT LIB_INSTALL_TARGET)
-+if(NOT TARGET lib_install)
-     add_custom_target(lib_install)
- endif()
- 
-@@ -104,8 +102,7 @@ add_custom_target(${module}_copy_header
-                     COMMENT "Copying Headers of ${module}")
- 
- # check if copy_header target already exists and create it
-get_target_property(COPY_HEADER_TARGET copy_header TYPE)
-if(NOT COPY_HEADER_TARGET)
-+if(NOT TARGET copy_header)
-     add_custom_target(copy_header)
- endif()
- # if copy_header is selected, modulename_copy_header target must be created
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch b/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch
deleted file mode 100644
index f4b44ff47..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 72d6160d1efc9df8bdee4e3dc9da67560f2206b4 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 10:52:52 +0000
-Subject: [PATCH 5/5] units: cmake: fix use of add_dependencies
-With CMake 4 we get during configure:
-| CMake Error at isp-imx/4.2.2.25.2/sources/isp-imx-4.2.2.25.2-3cac1fb:
-|   The dependency target "drv/OS08a20" of target "copy_shell_libs_isi" does
-|   not exist.
-Comment out that the add_dependencies. The driver for OS08a20 is still
-part of the built packages.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- units/isi/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
-index ea01aa7d9424..2f5c3d803e67 100755
--- a/units/isi/CMakeLists.txt
-+++ b/units/isi/CMakeLists.txt
-@@ -93,7 +93,7 @@ add_custom_target(copy_shell_libs_${module} ALL
-        COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*/*.cfg  ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
-        COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*.cfg  ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
- )
-add_dependencies(copy_shell_libs_${module} drv/OS08a20)
-+#add_dependencies(copy_shell_libs_${module} os08a20_shared)
- 
- endif (GENERATE_PARTITION_BUILD)
- 
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
index 445822528..0a8ce57c0 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
@@ -1,24 +1,20 @@
-# Copyright (C) 2020-2024 NXP
+# Copyright 2020-2025 NXP
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
-SRC_URI = " \
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ISP_SYSTEMD_PATCH}', '', d)}"
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ISP_SYSTEMD_PATCH}', '', d)} \
-    file://0002-appshell-cmake-bump-min-version-to-3.5.patch \
-    file://0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch \
-    file://0004-units-targets.cmake-fix-check-if-a-target-exists.patch \
-    file://0005-units-cmake-fix-use-of-add_dependencies.patch \
-"
 ISP_SYSTEMD_PATCH = "file://0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch"
-IMX_SRCREV_ABBREV = "3cac1fb"
+SRC_URI[sha256sum] = "ab04d9eae4917591ca21f4ae13269c4e5a6f1b8e2f357cca1693682fa9a87249"
-S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "8fa5094da6438505287f4dcc8033dad3057ab81bf98c858884f7c3a2e521b252"
+IMX_SRCREV_ABBREV = "3cbd4a2"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack cmake pkgconfig systemd use-imx-headers
@@ -52,18 +48,9 @@ EXTRA_OECMAKE += " \
    -D3A_SRC_BUILD=0 \
    -DIMX_G2D=ON \
    -Wno-dev \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
 "
-do_configure_disable:prepend () {
-    # FIXME: should be rebuild.
-    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/bin/isp_media_server
-    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/lib/libmedia_server.so
-    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/tuningext/install/tuningext
-    # FIXME: Should be rebuild.
-    patchelf --replace-needed libtinyxml2.so.10 libtinyxml2.so.11 ${S}/appshell/shell_libs/ispcore/ARM64/libcam_device.so
-}
 do_install() {
    # The Makefile unconditionally installs tuningext even if it is not built
    if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
@@ -76,11 +63,17 @@ do_install() {
        rm ${D}/opt/imx8-isp/bin/tuningext
    fi
+    # The prebuilt ISP components were linked against jsoncpp 1.9.6
+    # (SONAME 26). jsoncpp 1.9.7 ships SONAME 27, so update the dynamic
+    # dependency.
+    patchelf --replace-needed libjsoncpp.so.26 libjsoncpp.so.27 \
+        ${D}${libdir}/libmedia_server.so \
+        ${D}/opt/imx8-isp/bin/isp_media_server
    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
        install -d ${D}${systemd_system_unitdir}
        install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
    fi
 }
 # The build contains a mix of versioned and unversioned libraries, so
@@ -97,6 +90,8 @@ FILES_SOLIBS_VERSIONED = " \
    ${libdir}/libos08a20.so \
 "
+INSANE_SKIP:${PN} = "already-stripped"
 RDEPENDS:${PN} = "libdrm"
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
index b1cd3d863..a94d6bf14 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
@@ -8,7 +8,7 @@ SECTION = "base"
 PV .= "+git${SRCPV}"
 SRCBRANCH ?= "master"
-SRCREV = "faf547cc2345bfbf95507ab7e86530f85289bb5b"
+SRCREV = "d44deb80af881b82f394d44696433e6695022c8c"
 SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \
           file://run-ptest \
          "
diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb
index 9fc6338c4..ade3570c4 100644
--- a/recipes-bsp/mxsldr/mxsldr_git.bb
+++ b/recipes-bsp/mxsldr/mxsldr_git.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRCREV = "c40d80472525e1d57dae5317c028b745968c0399"
-SRC_URI = "git://git.denx.de/mxsldr.git;branch=master \
+SRC_URI = "git://source.denx.de/denx/mxsldr.git;branch=master;protocol=https \
           file://0001-Do-not-ignore-OE-cflags-and-ldflags.patch \
           "
diff --git a/recipes-bsp/u-boot/u-boot-imx_2025.04.bb b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
index 27c3555f4..a27291460 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2018 (C) O.S. Systems Software LTDA.
-# Copyright 2017-2024 NXP
+# Copyright 2017-2026 NXP
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
@@ -34,19 +34,31 @@ do_deploy:append:mx8m-generic-bsp() {
                    for key_value in ${UBOOT_DTB_NAME_FLAGS}; do
                        local type_key="${key_value%%:*}"
                        local dtb_name="${key_value#*:}"
+                        local dtb_path=""
                        if [ "$type_key" = "$type" ]
                        then
                            bbnote "UBOOT_CONFIG = $type, UBOOT_DTB_NAME = $dtb_name"
                            # There is only one ${dtb_name}, the first one. All the other are with the type appended
                            if [ ! -f "${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}" ]; then
-                                install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
+                                if [ -f "${B}/${builddir}/arch/arm/dts/${dtb_name}" ]; then
+                                    dtb_path="arch/arm/dts"
+                                elif [ -f "${B}/${builddir}/dts/upstream/src/arm64/freescale/${dtb_name}" ]; then
+                                    dtb_path="dts/upstream/src/arm64/freescale"
+                                else
+                                    bbfatal "DTB '${dtb_name}' not found in expected locations"
+                                fi
+                                bbnote "DTB found at ${B}/${builddir}/${dtb_path}/${dtb_name}"
+                                install -m 0644 ${B}/${builddir}/${dtb_path}/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
                            else
                                bbwarn "Use custom wks.in for $dtb_name = $type"
                            fi
-                            install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
+                            if [ -f "${B}/${builddir}/${dtb_path}/${dtb_name}" ]; then
+                                install -m 0644 ${B}/${builddir}/${dtb_path}/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
+                            fi
                        fi
                        unset type_key
                        unset dtb_name
+                        unset dtb_path
                    done
                    unset UBOOT_DTB_NAME_FLAGS
@@ -66,5 +78,10 @@ do_deploy:append:mx93-generic-bsp() {
    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
 }
+do_deploy:append:mx95-generic-bsp() {
+    # Deploy CRT.* from u-boot for stmm
+    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
+}
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp|mx9-generic-bsp)"
diff --git a/recipes-connectivity/iproute2/iproute2_%.bbappend b/recipes-connectivity/iproute2/iproute2_%.bbappend
index 0f9b5a87d..660984d7a 100644
--- a/recipes-connectivity/iproute2/iproute2_%.bbappend
+++ b/recipes-connectivity/iproute2/iproute2_%.bbappend
@@ -1,5 +1,11 @@
-do_install:append () {
+do_install:append:imx-generic-bsp () {
-    install -d ${D}/usr/include/tc 
+    install -d ${D}/usr/include/tc
+    cp -a ${B}/include  ${D}/usr/include
+    cp -a ${B}/tc/*.h    ${D}/usr/include/tc
+}
+do_install:append:qoriq-generic-bsp () {
+    install -d ${D}/usr/include/tc
    cp -a ${B}/include  ${D}/usr/include
    cp -a ${B}/tc/*.h    ${D}/usr/include/tc
 }
diff --git a/recipes-core/udev/udev-rules-qoriq.bb b/recipes-core/udev/udev-rules-qoriq.bb
index 792c32343..bd6158fe6 100644
--- a/recipes-core/udev/udev-rules-qoriq.bb
+++ b/recipes-core/udev/udev-rules-qoriq.bb
@@ -9,6 +9,7 @@ SRC_URI = "\
    file://74-ls1046a-xfi2-networking.rules \
    file://73-fsl-enetc-networking.rules \
 "
+S = "${UNPACKDIR}"
 RULE = "71-fsl-dpaa-persistent-networking.rules"
 RULE:e6500 = "72-fsl-dpaa-persistent-networking.rules"
diff --git a/recipes-devtools/half/half_2.1.0.bb b/recipes-devtools/half/half_2.1.0.bb
new file mode 100644
index 000000000..4914f8701
--- /dev/null
+++ b/recipes-devtools/half/half_2.1.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "C++ library for half precision floating point arithmetics"
+DESCRIPTION = "half is a C++ header-only library to provide an IEEE-754 conformant \ 
+half-precision floating point type along with corresponding arithmetic operators, \
+type conversions and common mathematical functions."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=813a6278831975d26c115ed6f9c21831"
+SRC_URI = "https://sourceforge.net/projects/half/files/half/${PV}/${BP}.zip"
+SRC_URI[sha256sum] = "ad1788afe0300fa2b02b0d1df128d857f021f92ccf7c8bddd07812685fa07a25"
+S = "${UNPACKDIR}"
+do_install () {
+    install -d ${D}${includedir}
+    cp -r ${S}/include/* ${D}${includedir}
+}
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-devtools/stb/stb_git.bb b/recipes-devtools/stb/stb_git.bb
new file mode 100644
index 000000000..f5d52f809
--- /dev/null
+++ b/recipes-devtools/stb/stb_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "single-file public domain (or MIT licensed) libraries for C/C++"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://stb.h;beginline=14418;endline=14433;md5=b10975d4c8155af1811ab611586f01d2"
+PV = "0.0+git${SRCPV}"
+SRCREV = "f67165c2bb2af3060ecae7d20d6f731173485ad0"
+SRC_URI = "git://github.com/nothings/stb.git;protocol=https;branch=master"
+do_install() {
+    install -d ${D}${includedir}
+    for hdr in ${S}/*.h; do
+        install -m 0644 $hdr ${D}${includedir}
+    done
+}
+# This is a header-only library, so the main package will be empty.
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-extended/dpdk/dpdk_22.11.bb b/recipes-extended/dpdk/dpdk_22.11.bb
index 727106e49..84bda4770 100644
--- a/recipes-extended/dpdk/dpdk_22.11.bb
+++ b/recipes-extended/dpdk/dpdk_22.11.bb
@@ -32,7 +32,6 @@ EXTRA_OEMESON = " \
        -Denable_driver_sdk=true \
        ${@bb.utils.contains('DISTRO_FEATURES', 'vpp', '-Dc_args="-Ofast -fPIC -ftls-model=local-dynamic"', '', d)} \
        -Denable_examples_source_install=false \
-        -Ddrivers_install_subdir= \
        -Denable_apps=${DPDK_APPS} \
 "
@@ -41,6 +40,8 @@ do_install:append(){
    cp -rf ${S}/nxp/* ${D}/${sysconfdir}/dpdk
 }
+INSANE_SKIP:${PN} = "dev-so"
 RDEPENDS:${PN} += "bash pciutils python3-core python3-pyelftools"
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-extended/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb
index bd788fdb5..a1f8a35a7 100644
--- a/recipes-extended/merge-files/merge-files_1.0.bb
+++ b/recipes-extended/merge-files/merge-files_1.0.bb
@@ -18,4 +18,4 @@ do_compile[noexec] = "1"
 FILES:${PN} = "/*"
 ALLOW_EMPTY:${PN} = "1"
-INSANE_SKIP:${PN} = "debug-files dev-so"
+INSANE_SKIP:${PN} = "dev-so"
diff --git a/recipes-fsl/fsl-rc-local/fsl-rc-local.bb b/recipes-fsl/fsl-rc-local/fsl-rc-local.bb
new file mode 100644
index 000000000..d5c8ebc31
--- /dev/null
+++ b/recipes-fsl/fsl-rc-local/fsl-rc-local.bb
@@ -0,0 +1,23 @@
+# Copyright (C) 2012 O.S. Systems Software LTDA.
+DESCRIPTION = "Extra files for fsl-gui-image"
+LICENSE = "LGPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=39ec502560ab2755c4555ee8416dfe42"
+SRC_URI = "file://rc.local.etc \
+           file://rc.local.init \
+           file://LICENSE"
+S = "${UNPACKDIR}"
+inherit update-rc.d
+INITSCRIPT_NAME = "rc.local"
+INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
+do_install () {
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 755 ${S}/rc.local.etc ${D}/${sysconfdir}/rc.local
+    install -m 755 ${S}/rc.local.init ${D}/${sysconfdir}/init.d/rc.local
+}
diff --git a/recipes-fsl/fsl-rc-local/fsl-rc-local/LICENSE b/recipes-fsl/fsl-rc-local/fsl-rc-local/LICENSE
new file mode 100644
index 000000000..757cfe655
--- /dev/null
+++ b/recipes-fsl/fsl-rc-local/fsl-rc-local/LICENSE
@@ -0,0 +1 @@
+All content inside fsl-rc-local package are distributed under GPLv2 license
diff --git a/recipes-fsl/fsl-rc-local/fsl-rc-local/rc.local.etc b/recipes-fsl/fsl-rc-local/fsl-rc-local/rc.local.etc
new file mode 100755
index 000000000..65634dfa4
--- /dev/null
+++ b/recipes-fsl/fsl-rc-local/fsl-rc-local/rc.local.etc
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+exit 0
diff --git a/recipes-fsl/fsl-rc-local/fsl-rc-local/rc.local.init b/recipes-fsl/fsl-rc-local/fsl-rc-local/rc.local.init
new file mode 100755
index 000000000..13402a758
--- /dev/null
+++ b/recipes-fsl/fsl-rc-local/fsl-rc-local/rc.local.init
@@ -0,0 +1,36 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          rc.local
+# Required-Start:    $all
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:
+# Short-Description: Run /etc/rc.local if it exist
+### END INIT INFO
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+do_start() {
+        if [ -x /etc/rc.local ]; then
+                echo -n "Running local boot scripts (/etc/rc.local)"
+                /etc/rc.local
+                [ $? = 0 ] && echo "." || echo "error"
+                return $ES
+        fi
+}
+case "$1" in
+    start)
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "Error: argument '$1' not supported" >&2
+        exit 3
+        ;;
+    stop)
+        ;;
+    *)
+        echo "Usage: $0 start|stop" >&2
+        exit 3
+        ;;
+esac
diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb
new file mode 100644
index 000000000..43af6f7e9
--- /dev/null
+++ b/recipes-fsl/images/fsl-image-machine-test.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "A console-only image that includes gstreamer packages, \
+Freescale's multimedia packages (VPU and GPU) when available, and \
+test and benchmark applications."
+IMAGE_FEATURES += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base', \
+                                                       '', d), d)} \
+    debug-tweaks \
+    tools-testapps \
+    tools-profile \
+"
+LICENSE = "MIT"
+inherit core-image
+CORE_IMAGE_EXTRA_INSTALL += " \
+    packagegroup-fsl-gstreamer1.0 \
+    packagegroup-fsl-gstreamer1.0-full \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-tools-gpu-external \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', \
+                         'packagegroup-fsl-tools-testapps', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', \
+                         'packagegroup-fsl-tools-benchmark', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', \
+                         'firmwared', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                         'weston weston-init', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \
+                         'weston-xwayland xterm', '', d)} \
+"
diff --git a/recipes-fsl/images/fsl-image-multimedia-full.bb b/recipes-fsl/images/fsl-image-multimedia-full.bb
new file mode 100644
index 000000000..0384162bc
--- /dev/null
+++ b/recipes-fsl/images/fsl-image-multimedia-full.bb
@@ -0,0 +1,8 @@
+# This image extends fsl-image-multimedia with additional
+# gstreamer plugins
+require fsl-image-multimedia.bb
+CORE_IMAGE_EXTRA_INSTALL += " \
+    packagegroup-fsl-gstreamer1.0-full \
+"
diff --git a/recipes-fsl/images/fsl-image-multimedia.bb b/recipes-fsl/images/fsl-image-multimedia.bb
new file mode 100644
index 000000000..3a3ce28b8
--- /dev/null
+++ b/recipes-fsl/images/fsl-image-multimedia.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "A console-only image that includes gstreamer packages and \
+Freescale's multimedia packages (VPU and GPU) when available for the specific \
+machine."
+IMAGE_FEATURES += "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base', \
+                                                       '', d), d)} \
+"
+LICENSE = "MIT"
+inherit core-image
+CORE_IMAGE_EXTRA_INSTALL += " \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-gstreamer1.0 \
+    packagegroup-imx-tools-audio \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                         'weston weston-init weston-examples \
+                          gtk+3-demo', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \
+                         'weston-xwayland xterm', '', d)} \
+"
+PACKAGE_IMX_TO_REMOVE = ""
+PACKAGE_IMX_TO_REMOVE:imxgpu2d = "gtk+3-demo"
+PACKAGE_IMX_TO_REMOVE:imxgpu3d = ""
+CORE_IMAGE_EXTRA_INSTALL:remove = "${PACKAGE_IMX_TO_REMOVE}"
diff --git a/recipes-fsl/images/fsl-image-network-full-cmdline.bb b/recipes-fsl/images/fsl-image-network-full-cmdline.bb
new file mode 100644
index 000000000..01f47c3e5
--- /dev/null
+++ b/recipes-fsl/images/fsl-image-network-full-cmdline.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "A console-only image that includes full cmdline and \
+Freescale's networking packages (QorIQ DPAA/DPAA2) when available."
+IMAGE_FEATURES += " \
+    debug-tweaks \
+    tools-profile \
+"
+LICENSE = "MIT"
+CORE_IMAGE_EXTRA_INSTALL:append = "\
+    packagegroup-core-boot \
+    packagegroup-core-full-cmdline \
+    packagegroup-fsl-network \
+"
+# SPI Nor-Flash
+NETWORK_TOOLS:append:fsl-lsch3 = "\
+    mtd-utils \
+"
+inherit core-image
diff --git a/recipes-fsl/mcore-demos/README b/recipes-fsl/mcore-demos/README
index 25013f996..bf0cf7725 100644
--- a/recipes-fsl/mcore-demos/README
+++ b/recipes-fsl/mcore-demos/README
@@ -1,15 +1,16 @@
 The M4 demo app version of each SoCs are followed:
 * 2.16.000 -- i.MX 7ULP
-* 25.09.00 -- i.MX 8MQ, 8MM
+* 26.03.00 -- i.MX 8MQ, 8MM
 * 2.9.0 -- i.MX 8DXL, 8QM, 8QXP
 * 1.0.1 -- i.MX 7D
 The M7 demo app version of each SoCs are followed:
-* 25.09.00 --  i.MX 8MP , 8MNULite, 8MN
+* 26.03.00 --  i.MX 8MP , 8MNULite, 8MN
-* 25.12.00 --  i.MX95
+* 26.03.00 --  i.MX95
+* 25.12.00 --  i.MX952
 The M33 demo app version of each SoCs are followed:
-* 25.12.00 --  i.MX 8ULP, 93
+* 26.03.00 --  i.MX 8ULP, 93
 The MCore demo app version of each SoCs are followed:
-* 25.12.00 --  i.MX 943
+* 26.03.00 --  i.MX 943
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_25.12.00.bb b/recipes-fsl/mcore-demos/imx-m33-demos_26.03.00.bb
index 4cf087859..fb0e94e47 100644
--- a/recipes-fsl/mcore-demos/imx-m33-demos_25.12.00.bb
+++ b/recipes-fsl/mcore-demos/imx-m33-demos_26.03.00.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d
 LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-SRC_URI[imx8ulp.sha256sum] = "115905810d24887cf14ed081b4f52c2ca846d94ee5ba6bf459790d3151af78d2"
+SRC_URI[imx8ulp.sha256sum] = "dcafb6989b1bf58ae5fef5b77c12007aa2eef6c02656b6ba13078579e222e2a8"
-SRC_URI[imx93.sha256sum] = "fbaf3baa6916757747696ba90a23d515ee10215b19a03e9feb5d6b16cc4d6a4f"
+SRC_URI[imx93.sha256sum] = "feca3c27892840d44e6f7759623fbea41469cc8cbbbe4ce434cd51fe71685742"
 COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_25.09.00.bb b/recipes-fsl/mcore-demos/imx-m4-demos_26.03.00.bb
index d096cf9dc..d5c0c300c 100644
--- a/recipes-fsl/mcore-demos/imx-m4-demos_25.09.00.bb
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_26.03.00.bb
@@ -6,8 +6,7 @@ require imx-mcore-demos.inc
 LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-SRC_URI[imx8mm.sha256sum] = "b2a08b5d5aeb23ffb9d30f915a551c891c997d6ed55f12a9e21103b6153752cc"
+SRC_URI[imx8mm.sha256sum] = "fd07b66367585f302c0ae17f42bae11909beef10bcd219f553bd16ceef731b58"
-SRC_URI[imx8mq.sha256sum] = "9cd1e2e1f328911ea7fb13cd4da213a2ca0d08108963ca501c694edad100ec3f"
+SRC_URI[imx8mq.sha256sum] = "96eed93c394d4e6263a8636c906bba7cc0fec17b28512f84a14ceb000a34eb62"
 COMPATIBLE_MACHINE = "(mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_25.12.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_25.12.00.bb
index 5154866cf..c09f70113 100644
--- a/recipes-fsl/mcore-demos/imx-m7-demos_25.12.00.bb
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_25.12.00.bb
@@ -3,9 +3,8 @@
 require imx-mcore-demos.inc
-LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac" 
+LIC_FILES_CHKSUM:mx952-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-SRC_URI[imx95.sha256sum] = "1ed885757d570a1bcd4309cd41d158827f855af451d140d056fa02f92e8b73eb"
+SRC_URI[imx952.sha256sum] = "e717f3a673ef76ba433d192e01c40e2c4ebf7d9487b23e2e505bd07383d797ca"
-COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
+COMPATIBLE_MACHINE = "(mx952-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_26.03.00.bb
index 224a164f6..904e5c08f 100644
--- a/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_26.03.00.bb
@@ -9,10 +9,13 @@ LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8
 LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-SRC_URI[imx8mn.sha256sum] = "6fb7bfad067f0dda55ce7d6e1f688da8d979e3a75a0a3e1325ad10684ce943b3"
+LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-SRC_URI[imx8mnddr3l.sha256sum] = "e107ca6f12e863368133a881d8b848813bdad77249777926880dffbebd3c30c9"
-SRC_URI[imx8mp.sha256sum] = "d97c215a466bc4155ca96b6c6697f1512d6650c29241559ffefa52de0eaf8535"
+SRC_URI[imx8mn.sha256sum] = "e02fd9d7beb72831e21481839fc58e023a5f5cad54665aeee98669a52da67e43"
+SRC_URI[imx8mnddr3l.sha256sum] = "eb7f479bf69cfa73bc59ba4289b25bcb01cafeb379839dec7797de8830137586"
-COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp)"
+SRC_URI[imx8mp.sha256sum] = "2ead4fa253e61dab3af84407ff7e60f66f6ea5b33b1c5eee9d83fc757263ba00"
+SRC_URI[imx95.sha256sum] = "84c2ad9c858f321488dbc6f7d4c6a111e00053bc16ec1e659593ec694c73ad10"
+COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp|mx95-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos_25.12.00.bb b/recipes-fsl/mcore-demos/imx-mcore-demos_26.03.00.bb
index 380821658..f2503c855 100644
--- a/recipes-fsl/mcore-demos/imx-mcore-demos_25.12.00.bb
+++ b/recipes-fsl/mcore-demos/imx-mcore-demos_26.03.00.bb
@@ -1,10 +1,10 @@
-# Copyright 2025 NXP
+# Copyright 2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 require imx-mcore-demos.inc
 LIC_FILES_CHKSUM:mx943-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-SRC_URI[imx943.sha256sum] = "52acc5cb421ae98b9b496512035f1635be7238c2f15178f62277269e4744b95a"
+SRC_URI[imx943.sha256sum] = "408e94e64b8e94d243737e0c068459036273a2ca384b63b893696c77d69c2807"
 COMPATIBLE_MACHINE = "(mx943-nxp-bsp)"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
new file mode 100644
index 000000000..9a86e5013
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Package group used by FSL Community to provide audio and video plugins \
+that are subject to restricted licensing and/or royalties and thus require \
+the 'commercial' license whitelist flag"
+SUMMARY = "FSL Community package group - set of GStreamer 1.0 plugins with commercial licence flag"
+LICENSE_FLAGS = "commercial"
+inherit packagegroup
+RDEPENDS:${PN} = " \
+    packagegroup-fsl-gstreamer1.0 \
+"
+# Plugins from the -ugly collection which require the "commercial" flag in LICENSE_FLAGS_ACCEPTED to be set
+RDEPENDS:${PN} = " \
+    gstreamer1.0-plugins-ugly-asf \
+    gstreamer1.0-libav \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
new file mode 100644
index 000000000..6b2c3ac0e
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Package group used by FSL Community to provide all GStreamer plugins from the \
+base, good, and bad packages, as well as the ugly and libav ones if commercial packages \
+are whitelisted, and plugins for the required hardware acceleration (if supported by the SoC)."
+SUMMARY = "FSL Community package group - full set of all GStreamer 1.0 plugins"
+inherit packagegroup
+RDEPENDS:${PN} = " \
+    packagegroup-fsl-gstreamer1.0 \
+    ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'packagegroup-fsl-gstreamer1.0-commercial', '', d)} \
+    gstreamer1.0-plugins-base-meta \
+    gstreamer1.0-plugins-good-meta \
+    gstreamer1.0-plugins-bad-meta \
+    ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'gstreamer1.0-plugins-ugly-meta', '', d)} \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
new file mode 100644
index 000000000..aef582a57
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
@@ -0,0 +1,118 @@
+DESCRIPTION = "Package group used by FSL Community to provide audio, video, networking and debug \
+GStreamer plugins with the required hardware acceleration (if supported by the SoC)."
+SUMMARY = "FSL Community package group - set of commonly used GStreamer 1.0 plugins"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+PACKAGES += " \
+    ${PN}-base \
+    ${PN}-audio \
+    ${PN}-video \
+    ${PN}-video-bad \
+    ${PN}-debug \
+    ${PN}-network-base \
+    ${PN}-network \
+"
+MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
+RDEPENDS:${PN} = " \
+    ${PN}-audio \
+    ${PN}-video \
+    ${PN}-network-base \
+    ${PN}-debug \
+"
+# List of X11 specific plugins
+GST_X11_PACKAGES = " \
+    gstreamer1.0-plugins-base-ximagesink \
+    gstreamer1.0-plugins-base-xvimagesink \
+"
+# List of Wayland specific plugins
+GST_WAYLAND_PACKAGES = " \
+    gstreamer1.0-plugins-bad-waylandsink \
+"
+# basic plugins required in virtually every pipeline
+RDEPENDS:${PN}-base = " \
+    gstreamer1.0 \
+    gstreamer1.0-plugins-base-playback \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '', d)} \
+    gstreamer1.0-plugins-base-audioconvert \
+    gstreamer1.0-plugins-base-audioresample \
+    gstreamer1.0-plugins-base-gio \
+    gstreamer1.0-plugins-base-typefindfunctions \
+    gstreamer1.0-plugins-base-videoconvertscale \
+    gstreamer1.0-plugins-base-volume \
+    gstreamer1.0-plugins-good-autodetect \
+    ${MACHINE_GSTREAMER_1_0_PLUGIN} \
+    ${@bb.utils.contains("MACHINE_GSTREAMER_1_0_PLUGIN", "imx-gst1.0-plugin", "imx-gst1.0-plugin-tools", "", d)} \
+"
+RRECOMMENDS:${PN}-base = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GST_X11_PACKAGES}', \
+                          bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                                            '${GST_WAYLAND_PACKAGES}', '', d), d)} \
+"
+# Basic audio plugins: parsers, demuxers, decoders
+RDEPENDS:${PN}-audio = " \
+    ${PN}-base \
+    gstreamer1.0-plugins-base-ogg \
+    gstreamer1.0-plugins-good-audioparsers \
+    gstreamer1.0-plugins-good-flac \
+    gstreamer1.0-plugins-good-icydemux \
+    gstreamer1.0-plugins-good-id3demux \
+    gstreamer1.0-plugins-good-speex \
+    gstreamer1.0-plugins-good-wavparse \
+"
+# Basic video plugins: parsers, demuxers
+RDEPENDS:${PN}-video = " \
+    ${PN}-base \
+    gstreamer1.0-plugins-base-subparse \
+    gstreamer1.0-plugins-base-theora \
+    gstreamer1.0-plugins-good-avi \
+    gstreamer1.0-plugins-good-flv \
+    gstreamer1.0-plugins-good-isomp4 \
+    gstreamer1.0-plugins-good-matroska \
+"
+RRECOMMENDS:${PN}-video = " \
+    ${PN}-audio \
+"
+# Additional video plugins from the -bad collection
+RDEPENDS:${PN}-video-bad = " \
+    ${PN}-video \
+    gstreamer1.0-plugins-bad-mpegpsdemux \
+    gstreamer1.0-plugins-bad-mpegtsdemux \
+    gstreamer1.0-plugins-bad-videoparsersbad \
+"
+# Plugins used for diagnostics and debugging of pipelines
+RDEPENDS:${PN}-debug = " \
+    ${PN}-base \
+    gstreamer1.0-plugins-base-audiotestsrc \
+    gstreamer1.0-plugins-base-videotestsrc \
+    gstreamer1.0-plugins-good-debug \
+    gstreamer1.0-plugins-good-navigationtest \
+"
+# Basic networking plugins required by most pipelines that receive and/or send data
+RDEPENDS:${PN}-network-base = " \
+    gstreamer1.0-plugins-base-tcp \
+    gstreamer1.0-plugins-good-soup \
+    gstreamer1.0-plugins-good-udp \
+"
+# Additional networking plugins
+RDEPENDS:${PN}-network = " \
+    ${PN}-network-base \
+    gstreamer1.0-plugins-good-rtp \
+    gstreamer1.0-plugins-good-rtpmanager \
+    gstreamer1.0-plugins-good-rtsp \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-network.bb b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
new file mode 100644
index 000000000..96e3097d5
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
@@ -0,0 +1,49 @@
+# Copyright (C) 2020 Jens Rehsack <sno@netbsd.org>
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Package group used by FSL Community to add the packages which provide (QorIQ) networking support."
+SUMMARY = "FSL Community package group - networking"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+NETWORK_TOOLS = "\
+        ethtool \
+"
+NETWORK_TOOLS:append:qoriq = " \
+        ceetm \
+        dpdk \
+        ovs-dpdk \
+        pktgen-dpdk \
+        tsntool \
+"
+# Data Place Acceleration Architecture
+NETWORK_TOOLS:append:fsl-lsch2 = "\
+        eth-config \
+"
+# 2nd generation Data Place Acceleration Architecture
+NETWORK_TOOLS:append:ls1088a = "\
+        aiopsl \
+        gpp-aioptool \
+        ofp \
+"
+NETWORK_TOOLS:append:ls2088a = "\
+        aiopsl \
+        gpp-aioptool \
+        ofp \
+"
+NETWORK_TOOLS:append:fsl-lsch3 = "\
+        dce \
+        restool \
+        spc \
+"
+RDEPENDS:${PN} = " \
+    ${NETWORK_TOOLS} \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
new file mode 100644
index 000000000..a361a4dd2
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -0,0 +1,28 @@
+# Copyright (C) 2014, 2016 Freescale Semiconductor
+# Copyright (C) 2015, 2016 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Package group used by FSL Community to provide graphic packages used \
+to test the several hardware accelerated graphics APIs including packages not \
+provided by Freescale."
+SUMMARY = "FSL Community Package group - tools/gpu/external"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+SOC_TOOLS_GPU_X11 = ""
+SOC_TOOLS_GPU_X11:imxgpu2d = " mesa-demos glmark2 gtkperf"
+SOC_TOOLS_GPU_FB = ""
+SOC_TOOLS_GPU_WAYLAND = ""
+SOC_TOOLS_GPU_XWAYLAND = ""
+SOC_TOOLS_GPU_XWAYLAND:imxgpu2d = "mesa-demos gtkperf"
+RDEPENDS:${PN} = " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland", "${SOC_TOOLS_GPU_XWAYLAND}", \
+       bb.utils.contains("DISTRO_FEATURES",     "wayland", "${SOC_TOOLS_GPU_WAYLAND}", \
+       bb.utils.contains("DISTRO_FEATURES",         "x11", "${SOC_TOOLS_GPU_X11}", \
+                                                           "${SOC_TOOLS_GPU_FB}", d), d), d)} \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
new file mode 100644
index 000000000..c7e820adb
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -0,0 +1,32 @@
+# Copyright (C) 2012-2014, 2016 Freescale Semiconductor
+# Copyright (C) 2015, 2016 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Package group used by FSL Community to add the packages which provide GPU support."
+SUMMARY = "FSL Community package group - tools/gpu"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+SOC_TOOLS_GPU = ""
+# i.MX6 SoloLite does not support apitrace because of its dependency on gles2.
+SOC_TOOLS_GPU:imxgpu2d = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'xserver-xorg-extension-viv-autohdmi', \
+                                                       '', d), d)} \
+"
+SOC_TOOLS_GPU:append:imxgpu3d = " \
+    imx-gpu-apitrace \
+"
+SOC_TOOLS_GPU:append:imxgpu = " \
+    imx-gpu-sdk \
+    imx-gpu-viv-tools \
+"
+RDEPENDS:${PN} = " \
+    ${SOC_TOOLS_GPU} \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb b/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
new file mode 100644
index 000000000..54a428fdf
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
@@ -0,0 +1,33 @@
+# Copyright (C) 2015 Freescale Semiconductor
+# Copyright (C) 2015 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "Set of audio tools for inclusion on images"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+inherit packagegroup
+ALSA_INSTALL = " \
+    alsa-utils \
+    alsa-tools \
+"
+PULSEAUDIO_INSTALL = " \
+    pulseaudio-server \
+    pulseaudio-module-cli \
+    pulseaudio-misc \
+    pulseaudio-module-device-manager \
+    ${@bb.utils.contains('DISTRO_FEATURES',"x11", "pulseaudio-module-x11-xsmp \
+                                                   pulseaudio-module-x11-publish \
+                                                   pulseaudio-module-x11-cork-request \
+                                                   pulseaudio-module-x11-bell \
+                                                   consolekit", \
+                                           "", d)} \
+"
+RDEPENDS:${PN} = " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "alsa",  "${ALSA_INSTALL}", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "pulseaudio",  "${PULSEAUDIO_INSTALL}", "", d)} \
+"
diff --git a/recipes-graphics/devil/devil_1.8.0.bb b/recipes-graphics/devil/devil_1.8.0.bb
new file mode 100644
index 000000000..dcbdf3ac1
--- /dev/null
+++ b/recipes-graphics/devil/devil_1.8.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A full featured cross-platform image library"
+SECTION = "libs"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
+PR = "r0"
+DEPENDS = "libpng jpeg tiff xz"
+SRC_URI = "http://sourceforge.net/projects/openil/files/DevIL/${PV}/DevIL-${PV}.zip"
+SRC_URI[sha256sum] = "451337f392c65bfb83698a781370534dc63d7bafca21e9b37178df0518f7e895"
+S = "${UNPACKDIR}/DevIL/DevIL"
+inherit cmake
+TARGET_CFLAGS += "-Dpng_set_gray_1_2_4_to_8=png_set_expand_gray_1_2_4_to_8"
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/drm/libdrm_2.4.123.imx.bb b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
index e4208cff3..198db014e 100644
--- a/recipes-graphics/drm/libdrm_2.4.123.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
@@ -13,8 +13,8 @@ DEPENDS = "libpthread-stubs"
 SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
 IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https"
-SRCBRANCH = "libdrm-imx-2.4.123"
+SRCBRANCH = "libdrm-imx-2.4.127"
-SRCREV = "c7c4953161a0f8f2cc7bee70284bf3263c9cfcf5"
+SRCREV = "ef5d39b51d2acfa66e165db89ba32ae32d55def5"
 DEFAULT_PREFERENCE = "-1"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-graphics/gli/gli_0.8.4.0.bb b/recipes-graphics/gli/gli_0.8.4.0.bb
new file mode 100644
index 000000000..14d6a75ed
--- /dev/null
+++ b/recipes-graphics/gli/gli_0.8.4.0.bb
@@ -0,0 +1,22 @@
+SUMMARY = "OpenGL Image Library"
+DESCRIPTION = "OpenGL Image (GLI) is a header only C++ \
+image library for graphics software."
+HOMEPAGE = "http://gli.g-truc.net"
+BUGTRACKER = "https://github.com/g-truc/gli/issues"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://readme.md;beginline=19;endline=20;md5=ab03b667ee630c1abb1add70365a50fb"
+SRC_URI = " \
+    git://github.com/g-truc/gli;protocol=https;branch=master \
+"
+SRCREV = "0c171ee87fcfe35a7e0e0445adef06f92e0b6a91"
+inherit cmake
+# This is a header-only library, so the main package will be empty.
+ALLOW_EMPTY:${PN} = "1"
+BBCLASSEXTEND = "native"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.4.0.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
index 4e3444b9d..94a876a94 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.4.0.0.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac" 
 DEPENDS = "libdrm ${LIBGAL_IMX}"
 LIBGAL_IMX        = ""
@@ -15,14 +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 = "9e8bbf1"
+IMX_SRCREV_ABBREV = "f126d54"
 IMX_SRC_URI_NAME = "v1"
-SRC_URI[v1.sha256sum] = "67be9b56a5d2196613460d3cc3a734d7a088e2177377e27f83287766d5d8cf70"
+SRC_URI[v1.sha256sum] = "344116d525d98b4ec1fd9713c611c47323778245939e0a4770ad847f8965644b"
-IMX_SRCREV_ABBREV:imxmali = "9e8bbf1"
+IMX_SRCREV_ABBREV:imxmali = "f126d54"
 IMX_SRC_URI_NAME:imxmali = "v2"
-SRC_URI[v2.sha256sum] = "f56dae607f89e0f414625657d8345c5d1b68b79d3ac61e50016fbe4d49a91402"
+SRC_URI[v2.sha256sum] = "baa9a48a954bcdcf7eb9a14022cf6c9daa27281c642bec2ba3c24ca428c5b952"
 S = "${UNPACKDIR}/${IMX_BIN_NAME}"
 inherit fsl-eula-unpack
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 98e976100..af92476e1 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 DEPENDS = "cairo"
-PV = "2.4+git"
+PV = "2.5.0+git"
 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.4"
+SRCBRANCH = "imx_2.5"
-SRCREV = "7d12c50c07d73650b4c97906ce917aff429238f8"
+SRCREV = "22ca65feb57702832fbaca7f7c9c8d691466e649"
 inherit pkgconfig
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
index 7ee61ff83..1a359676f 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.2.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
@@ -1,20 +1,19 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2022 NXP
+# Copyright 2017-2022,2026 NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "G2D library using i.MX GPU"
-HOMEPAGE = "https://www.nxp.com/"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 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 = "3c5e429"
+IMX_SRCREV_ABBREV = "8626797"
-SRC_URI[aarch64.sha256sum] = "190bc9203e60e5de508e1dcf057b36d2c9bc3667c6972fd12f7df797e508a22d"
+SRC_URI[aarch64.sha256sum] = "c2f68f79a6718f04f9df781925777ad6aec64edfdb4c35ca7e42f2b39d19fb4f"
-SRC_URI[arm.sha256sum] = "aaf9a38fe446af579b16a836bf297f8cb1b2842ca3a784bedc21e32d37271ab4"
+SRC_URI[arm.sha256sum] = "aa2b5525a3a58e2650d2594fdf2c7145cbf36ca99c5fe54111c39440069e0651"
 S = "${UNPACKDIR}/${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 8165c0c62..2b848e89c 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2025 NXP
+# Copyright 2017-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "G2D library using i.MX PXP"
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
 PROVIDES += "virtual/libg2d"
-PV = "2.4+git"
+PV = "2.5.0+git"
 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.4"
+SRCBRANCH = "imx_2.5"
-SRCREV = "c3368ea82e4507d7b35aee258c28d04f9f8fb8e9"
+SRCREV = "7dd4ca631b894a29389dadda5bd112cfa576b2d9"
 inherit use-imx-headers
diff --git a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk-src.inc b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk-src.inc
new file mode 100644
index 000000000..3c927b587
--- /dev/null
+++ b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk-src.inc
@@ -0,0 +1,4 @@
+SRC_URI = "${GPU_SDK_SRC};branch=${GPU_SDK_SRC_BRANCH}"
+GPU_SDK_SRC ?= "git://github.com/nxp-imx/gtec-demo-framework.git;protocol=https"
+GPU_SDK_SRC_BRANCH ?= "master"
+SRCREV = "35bbd45ed6eac169a778bd154283771b9bf39be7"
diff --git a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
new file mode 100644
index 000000000..e1510baf3
--- /dev/null
+++ b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
@@ -0,0 +1,145 @@
+SUMMARY = "i.MX GPU SDK Samples"
+DESCRIPTION = "Set of sample applications for i.MX GPU"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://License.md;md5=9d58a2573275ce8c35d79576835dbeb8"
+DEPENDS_BACKEND = \
+    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libxdg-shell wayland', \
+        bb.utils.contains('DISTRO_FEATURES',     'x11',               ' xrandr', \
+                                                                             '', d), d)}"
+DEPENDS_MX8       = ""
+DEPENDS_MX8:mx8-nxp-bsp   = " \
+    glslang-native \
+    opencv \
+    rapidopencl \
+    rapidopenvx \
+    rapidvulkan \
+    vulkan-headers \
+    vulkan-loader \
+"
+DEPENDS_MX8:mx8mm-nxp-bsp = " \
+    opencv \
+"
+DEPENDS = " \
+    assimp \
+    cmake-native \
+    devil \
+    fmt \
+    gli \
+    glm \
+    gstreamer1.0 \
+    gstreamer1.0-plugins-base \
+    gtest \
+    half \
+    ninja-native \
+    nlohmann-json \
+    rapidjson \
+    stb \
+    zlib \
+    ${DEPENDS_BACKEND} \
+    ${DEPENDS_MX8} \
+"
+DEPENDS:append:imxgpu2d = " virtual/libg2d virtual/libopenvg"
+DEPENDS:append:imxgpu3d = " virtual/libgles2"
+require imx-gpu-sdk-src.inc
+WINDOW_SYSTEM = \
+    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'Wayland_XDG', \
+        bb.utils.contains('DISTRO_FEATURES',     'x11',         'X11', \
+                                                                 'FB', d), d)}"
+FEATURES                  = "ConsoleHost,EarlyAccess,EGL,GoogleUnitTest,Lib_NlohmannJson,OpenVG,Test_RequireUserInputToExit,WindowHost"
+FEATURES:append:imxgpu    = ",HW_GPU_VIVANTE"
+FEATURES:append:imxgpu2d  = ",G2D"
+FEATURES:append:imxgpu3d  = ",OpenGLES2"
+FEATURES:append           = "${FEATURES_SOC}"
+FEATURES_SOC              = ""
+FEATURES_SOC:mx6q-nxp-bsp         = ",OpenGLES3"
+FEATURES_SOC:mx6dl-nxp-bsp        = ",OpenGLES3"
+FEATURES_SOC:mx8-nxp-bsp          = ",OpenCV4,Vulkan1.2,OpenGLES3.2,OpenCL1.2,OpenVX1.2"
+FEATURES_SOC:mx8mm-nxp-bsp        = ",OpenCV4"
+EXTENSIONS               = "*"
+EXTENSIONS:mx6q-nxp-bsp  = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
+EXTENSIONS:mx6dl-nxp-bsp = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
+EXTENSIONS:mx8m-nxp-bsp  = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_color_buffer_float"
+EXTENSIONS:mx8mm-nxp-bsp = "*"
+do_compile () {
+    export FSL_PLATFORM_NAME=Yocto
+    export ROOTFS=${STAGING_DIR_HOST}
+    . ./prepare.sh
+    FslBuild.py -vvvvv -t sdk --UseFeatures [${FEATURES}] --UseExtensions [${EXTENSIONS}] --Variants [WindowSystem=${WINDOW_SYSTEM}] --BuildThreads ${@oe.utils.parallel_make(d)} -c install --CMakeInstallPrefix ${S}
+}
+REMOVALS = " \
+    GLES2/DeBayer \
+    GLES2/DirectMultiSamplingVideoYUV \
+    GLES3/DirectMultiSamplingVideoYUV \
+"
+REMOVALS:append:imxdpu = " \
+    G2D/EightLayers \
+"
+REMOVALS:append:mx6q-nxp-bsp = " \
+    GLES3/HDR02_FBBasicToneMapping \
+    GLES3/HDR03_SkyboxTonemapping \
+    GLES3/HDR04_HDRFramebuffer \
+"
+REMOVALS:append:mx6dl-nxp-bsp = " \
+    GLES3/HDR02_FBBasicToneMapping \
+    GLES3/HDR03_SkyboxTonemapping \
+    GLES3/HDR04_HDRFramebuffer \
+"
+do_install () {
+    install -d "${D}/opt/${PN}"
+    cp -r ${S}/bin/* ${D}/opt/${PN}
+    for removal in ${REMOVALS}; do
+        rm -rf ${D}/opt/${PN}/$removal
+    done
+}
+FILES:${PN} += "/opt/${PN}"
+FILES:${PN}-dbg += "/opt/${PN}/*/*/.debug /usr/src/debug"
+INSANE_SKIP:${PN} += "already-stripped rpaths"
+# Unfortunately recipes with an empty main package, like header-only libraries,
+# are not included in the SDK. Use RDEPENDS as a workaround.
+RDEPENDS_EMPTY_MAIN_PACKAGE = " \
+    fmt \
+    gli \
+    glm \
+    googletest \
+    half \
+    nlohmann-json \
+    rapidjson \
+    stb \
+"
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8       = ""
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp   = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libxdg-shell', '', d)} \
+    rapidopencl \
+    rapidopenvx \
+    rapidvulkan \
+"
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8mm-nxp-bsp = ""
+# vulkan-loader is dynamically loaded, so need to add an explicit
+# dependency
+RDEPENDS_VULKAN_LOADER       = ""
+RDEPENDS_VULKAN_LOADER:mx8-nxp-bsp   = "vulkan-validation-layers vulkan-loader"
+RDEPENDS_VULKAN_LOADER:mx8mm-nxp-bsp = ""
+RDEPENDS:${PN} += " \
+    ${RDEPENDS_EMPTY_MAIN_PACKAGE} \
+    ${RDEPENDS_EMPTY_MAIN_PACKAGE_MX8} \
+    ${RDEPENDS_VULKAN_LOADER} \
+"
+# For backwards compatibility
+RPROVIDES:${PN} = "fsl-gpu-sdk"
+RREPLACES:${PN} = "fsl-gpu-sdk"
+RCONFLICTS:${PN} = "fsl-gpu-sdk"
+COMPATIBLE_MACHINE = "(imxgpu)"
diff --git a/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
new file mode 100644
index 000000000..a5637869a
--- /dev/null
+++ b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Provides XDG shell header and glue code library"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/License.md;md5=9d58a2573275ce8c35d79576835dbeb8"
+DEPENDS = "wayland-native wayland wayland-protocols"
+require imx-gpu-sdk-src.inc
+SRC_URI += "file://0001-xdg-shell-Add-CMake-minimum.patch"
+S = "${UNPACKDIR}/${BP}/ThirdParty/Recipe/xdg-shell"
+inherit cmake pkgconfig
+EXTRA_OECMAKE = " \
+    -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
+    -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols \
+"
+ALLOW_EMPTY:${PN} = "1"
+RDEPENDS:${PN}-dev = "${PN}-staticdev"
diff --git a/recipes-graphics/imx-gpu-sdk/libxdg-shell/0001-xdg-shell-Add-CMake-minimum.patch b/recipes-graphics/imx-gpu-sdk/libxdg-shell/0001-xdg-shell-Add-CMake-minimum.patch
new file mode 100644
index 000000000..9ece7d8f7
--- /dev/null
+++ b/recipes-graphics/imx-gpu-sdk/libxdg-shell/0001-xdg-shell-Add-CMake-minimum.patch
@@ -0,0 +1,38 @@
+From 6e38ee09378bfa7edc97528967f0dd0bd810f2c6 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Thu, 9 Oct 2025 08:29:44 -0500
+Subject: [PATCH] xdg-shell: Add CMake minimum
+The build is broken:
+```
+| CMake Error in CMakeLists.txt:
+|   No cmake_minimum_required command is present.  A line of code such as
+|
+|     cmake_minimum_required(VERSION 4.1)
+|
+|   should be added at the top of the file.  The version specified may be lower
+|   if you wish to support older CMake versions for this project.  For more
+|   information run "cmake --help-policy CMP0000".
+```
+Upstream-Status: Pending
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d39c6c5..5cb52e32 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ # Generate the client header and glue library from xdg-shell.xml
+ 
+cmake_minimum_required(VERSION 3.5)
+
+ include(FindPkgConfig)
+ 
+ if (NOT DEFINED WAYLAND_PROTOCOLS_DIR)
+-- 
+2.34.1
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 3b05b2abd..38f976c71 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -339,7 +339,7 @@ INSANE_SKIP:libgbm-imx += "dev-so"
 FILES:libvulkan-imx = "\
    ${libdir}/libvulkan_VSI${REALSOLIBS} \
-    ${sysconfdir}/vulkan"
+    ${datadir}/vulkan"
 FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
 RPROVIDES:libvulkan-imx = "virtual-vulkan-icd"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch32.bb
deleted file mode 100644
index f0e7d285d..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch32.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-IMX_SRCREV_ABBREV = "3c5e429"
-SRC_URI[sha256sum] = "ea7ffb01fd7cd88f2a308e5b12b40cc3c9553b8ff2941c4867943b4fee265d27"
-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.p3.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch64.bb
deleted file mode 100644
index 38870add7..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch64.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-IMX_SRCREV_ABBREV = "3c5e429"
-SRC_URI[sha256sum] = "bf6fe102e8aa7a16373392efcf6ac45d705bbb95f5c39501da8aaa30957c554f"
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch32.bb
new file mode 100644
index 000000000..86a7c20a3
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch32.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+IMX_SRCREV_ABBREV = "8626797"
+SRC_URI[sha256sum] = "db361e1f9db45f498fd669e1f58823d937d436e6fc797da6c710cf35609b47a9"
+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.p4.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb
new file mode 100644
index 000000000..5a6ba030a
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb
@@ -0,0 +1,27 @@
+require imx-gpu-viv-6.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+IMX_SRCREV_ABBREV = "8626797"
+SRC_URI[sha256sum] = "8cc97005a7469c0e83139cf1b9a8106fa6f0a84fb6f87d0f6bb9808408305c28"
+do_install:prepend() {
+    if [ "${IS_MX8}" = "1" ]; then
+        if [ ! -z "${PACKAGES_VULKAN}" ]; then
+            mkdir -p ${S}/gpu-core/etc/vulkan/icd.d
+            mv ${S}/gpu-core/usr/share/vulkan/icd.d/verisilicon_icd.json ${S}/gpu-core/etc/vulkan/icd.d/imx_icd.json
+        fi
+    fi
+}
+do_install:append() {
+    if [ "${IS_MX8}" = "1" ]; then
+        if [ ! -z "${PACKAGES_VULKAN}" ]; then
+            mkdir -p ${D}${datadir}/vulkan/icd.d
+            mv ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json ${D}${datadir}/vulkan/icd.d/verisilicon_icd.json
+        fi
+    fi
+}
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index 3caf8aa15..0a4a3a4a4 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -8,8 +8,8 @@ PACKAGECONFIG:remove = " ${PACKAGECONFIG_REMOVE}"
 PACKAGECONFIG_APPEND ?= " \
    gbm \
-    opencl \
    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
+PACKAGECONFIG_APPEND:append:imxviv:mx8-nxp-bsp = " opencl"
 PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp  = ""
 PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp  = ""
diff --git a/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb b/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
new file mode 100644
index 000000000..d4200d394
--- /dev/null
+++ b/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Experimental low level header only C++11 RAII wrapper classes for the OpenCL API"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
+SRC_URI = "git://github.com/Unarmed1000/RapidOpenCL;protocol=https;branch=master \
+"
+SRCREV = "21254804a56ae96e8385c2652733c338d62da04f"
+# RapidOpenCL is a header-only C++11 RAII wrapper class, so the main package will be empty.
+do_install () {
+    install -d ${D}${includedir}
+    cp -r ${S}/include/* ${D}${includedir}
+}
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb b/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
new file mode 100644
index 000000000..049fca0fd
--- /dev/null
+++ b/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Low level header only C++11 RAII wrapper classes for the OpenVX API"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
+SRC_URI = "git://github.com/Unarmed1000/RapidOpenVX;protocol=https;branch=master \
+"
+SRCREV = "909c7abbff0ee35610f07f6fadeaf3a2eadce36e"
+do_install () {
+    install -d ${D}${includedir}
+    cp -r ${S}/include/* ${D}${includedir}
+}
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
new file mode 100644
index 000000000..c37cf7411
--- /dev/null
+++ b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Low level header only C++11 RAII wrapper classes for the Vulkan API"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
+DEPENDS = "vulkan-loader"
+SRC_URI = "git://github.com/Unarmed1000/RapidVulkan;protocol=https;branch=master"
+SRCREV = "e39a407c5ae880792d8843ada65a19dd26b3dca7"
+REQUIRED_DISTRO_FEATURES = "vulkan"
+inherit cmake features_check
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-graphics/vulkan/assimp/0001-X3D-Fix-invalid-vector-back-usage-6283.patch b/recipes-graphics/vulkan/assimp/0001-X3D-Fix-invalid-vector-back-usage-6283.patch
new file mode 100644
index 000000000..1b2bb5b1a
--- /dev/null
+++ b/recipes-graphics/vulkan/assimp/0001-X3D-Fix-invalid-vector-back-usage-6283.patch
@@ -0,0 +1,52 @@
+From 59bc03d931270b6354690512d0c881eec8b97678 Mon Sep 17 00:00:00 2001
+From: Kim Kulling <kimkulling@users.noreply.github.com>
+Date: Fri, 25 Jul 2025 15:01:16 +0200
+Subject: [PATCH] X3D: Fix invalid vector::back usage (#6283)
+* X3D: Fix invalid vector::back usage
+Upstream-Status: Backport [https://github.com/assimp/assimp/commit/59bc03d931270b6354690512d0c881eec8b97678]
+---
+ code/AssetLib/X3D/X3DGeoHelper.cpp | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+diff --git a/code/AssetLib/X3D/X3DGeoHelper.cpp b/code/AssetLib/X3D/X3DGeoHelper.cpp
+index 1c962a460..b90956d2c 100644
+--- a/code/AssetLib/X3D/X3DGeoHelper.cpp
+++ b/code/AssetLib/X3D/X3DGeoHelper.cpp
+@@ -128,13 +128,17 @@ void X3DGeoHelper::rect_parallel_epiped(const aiVector3D &pSize, std::list<aiVec
+ 
+ #undef MESH_RectParallelepiped_CREATE_VERT
+ 
+static constexpr int InvalidIndex = -1;
+
+ void X3DGeoHelper::coordIdx_str2faces_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces, unsigned int &pPrimitiveTypes) {
+     std::vector<int32_t> f_data(pCoordIdx);
+     std::vector<unsigned int> inds;
+     unsigned int prim_type = 0;
+ 
+-    if (f_data.back() != (-1)) {
+-        f_data.push_back(-1);
+    if (!f_data.empty()) {
+        if (f_data.back() != InvalidIndex) {
+            f_data.push_back(InvalidIndex);
+        }
+     }
+ 
+     // reserve average size.
+@@ -191,8 +195,10 @@ mg_m_err:
+ void X3DGeoHelper::coordIdx_str2lines_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces) {
+     std::vector<int32_t> f_data(pCoordIdx);
+ 
+-    if (f_data.back() != (-1)) {
+-        f_data.push_back(-1);
+    if (!f_data.empty()) {
+        if (f_data.back() != InvalidIndex) {
+            f_data.push_back(InvalidIndex);
+        }
+     }
+ 
+     // reserve average size.
+-- 
+2.34.1
diff --git a/recipes-graphics/vulkan/assimp_5.4.3.bb b/recipes-graphics/vulkan/assimp_5.4.3.bb
new file mode 100644
index 000000000..ff4fb7719
--- /dev/null
+++ b/recipes-graphics/vulkan/assimp_5.4.3.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \
+               various well-known 3D model formats in a uniform manner."
+HOMEPAGE = "http://www.assimp.org/"
+SECTION = "devel"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d9d5275cab4fb13ae624d42ce64865de"
+DEPENDS = "zlib"
+SRC_URI = "git://github.com/assimp/assimp.git;protocol=https;branch=master \
+           file://0001-X3D-Fix-invalid-vector-back-usage-6283.patch"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
+SRCREV = "c35200e38ea8f058812b83de2ef32c6093b0ece2"
+inherit cmake
+do_unpack:append() {
+    bb.build.exec_func('remove_non_compliant_source', d)
+}
+remove_non_compliant_source() {
+    # Remove non-compliant files manually. A patch file cannot be used
+    # since many of the files are binary.
+    rm -rf ${S}/test/models-nonbsd ${S}/scripts/StepImporter/schema_ifc2x3.exp
+}
+EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}"
+BBCLASSEXTEND = "native nativesdk"
+# Work around do_package_qa error
+INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer/0001-wayland-Add-C-guard-before-__STDC_VERSION__-define.patch b/recipes-graphics/vulkan/vulkan-wsi-layer/0001-wayland-Add-C-guard-before-__STDC_VERSION__-define.patch
new file mode 100644
index 000000000..ca76a1231
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer/0001-wayland-Add-C-guard-before-__STDC_VERSION__-define.patch
@@ -0,0 +1,106 @@
+From aa5d634a607d58f45cc9ccbdc1f80c94685a45a2 Mon Sep 17 00:00:00 2001
+From: Franz Schnyder <franz.schnyder@toradex.com>
+Date: Wed, 3 Jun 2026 10:00:55 +0200
+Subject: [PATCH] wayland: Add C++ guard before __STDC_VERSION__ define
+'__STDC_VERSION__' is predefined by the compiler in C++ mode. Redefining
+it triggers '-Wbuiltin-macro-redefined', which with '-Werror' fails the
+build under GCC 16.
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/work_items/33]
+Signed-off-by: Franz Schnyder <franz.schnyder@toradex.com>
+---
+ wsi/wayland/surface.hpp            | 3 +++
+ wsi/wayland/surface_properties.cpp | 2 ++
+ wsi/wayland/swapchain.hpp          | 3 +++
+ wsi/wayland/wl_helpers.hpp         | 3 +++
+ wsi/wayland/wl_object_owner.hpp    | 3 +++
+ 5 files changed, 14 insertions(+)
+diff --git a/wsi/wayland/surface.hpp b/wsi/wayland/surface.hpp
+index f060f00..92aa598 100644
+--- a/wsi/wayland/surface.hpp
+++ b/wsi/wayland/surface.hpp
+@@ -28,9 +28,12 @@
+ 
+ #pragma once
+ 
+#ifndef __cplusplus
+ #ifndef __STDC_VERSION__
+ #define __STDC_VERSION__ 0
+ #endif
+#endif
+
+ #include <wayland-client.h>
+ 
+ #include "wsi/surface.hpp"
+diff --git a/wsi/wayland/surface_properties.cpp b/wsi/wayland/surface_properties.cpp
+index e6435b9..caf840d 100644
+--- a/wsi/wayland/surface_properties.cpp
+++ b/wsi/wayland/surface_properties.cpp
+@@ -24,9 +24,11 @@
+ 
+ #define VK_USE_PLATFORM_WAYLAND_KHR 1
+ 
+#ifndef __cplusplus
+ #ifndef __STDC_VERSION__
+ #define __STDC_VERSION__ 0
+ #endif
+#endif
+ 
+ #include <wayland-client.h>
+ #include <linux-dmabuf-unstable-v1-client-protocol.h>
+diff --git a/wsi/wayland/swapchain.hpp b/wsi/wayland/swapchain.hpp
+index 7667324..95096f8 100644
+--- a/wsi/wayland/swapchain.hpp
+++ b/wsi/wayland/swapchain.hpp
+@@ -31,9 +31,12 @@ extern "C" {
+ #include <vulkan/vk_icd.h>
+ }
+ 
+#ifndef __cplusplus
+ #ifndef __STDC_VERSION__
+ #define __STDC_VERSION__ 0
+ #endif
+#endif
+
+ #include <wayland-client.h>
+ #include <linux-dmabuf-unstable-v1-client-protocol.h>
+ #include "util/wsialloc/wsialloc.h"
+diff --git a/wsi/wayland/wl_helpers.hpp b/wsi/wayland/wl_helpers.hpp
+index 1f6bad6..2ca131b 100644
+--- a/wsi/wayland/wl_helpers.hpp
+++ b/wsi/wayland/wl_helpers.hpp
+@@ -26,9 +26,12 @@
+ 
+ #include <stdint.h>
+ 
+#ifndef __cplusplus
+ #ifndef __STDC_VERSION__
+ #define __STDC_VERSION__ 0
+ #endif
+#endif
+
+ #include <wayland-client.h>
+ 
+ #include "util/custom_allocator.hpp"
+diff --git a/wsi/wayland/wl_object_owner.hpp b/wsi/wayland/wl_object_owner.hpp
+index d317e28..564fd5a 100644
+--- a/wsi/wayland/wl_object_owner.hpp
+++ b/wsi/wayland/wl_object_owner.hpp
+@@ -24,9 +24,12 @@
+ 
+ #pragma once
+ 
+#ifndef __cplusplus
+ #ifndef __STDC_VERSION__
+ #define __STDC_VERSION__ 0
+ #endif
+#endif
+
+ #include <wayland-client.h>
+ #include <linux-dmabuf-unstable-v1-client-protocol.h>
+ #include <linux-explicit-synchronization-unstable-v1-protocol.h>
+-- 
+2.43.0
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
index efa6accb3..0118975a5 100644
--- a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
@@ -8,10 +8,13 @@ PV = "0.0+git${SRCPV}"
 SRC_URI = "git://gitlab.freedesktop.org/mesa/vulkan-wsi-layer.git;protocol=https;branch=main \
           file://0001-MGS-6801-ccc-vkmark-on-wayland.patch \
           file://0002-MGS-6823-nxp-Add-support-of-VK_COMPOSITE_ALPHA_OPAQU.patch \
-           file://0003-Update-minimum-version-of-CMake.patch"
+           file://0003-Update-minimum-version-of-CMake.patch \
+           file://0001-wayland-Add-C-guard-before-__STDC_VERSION__-define.patch"
 SRCREV = "cb1a50cf7e640ad7306e673131ded98c0f133628"
-inherit cmake pkgconfig
+REQUIRED_DISTRO_FEATURES = "vulkan"
+inherit cmake pkgconfig features_check
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'headless', d)}"
diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend
index e88f558d4..fd375271f 100644
--- a/recipes-graphics/waffle/waffle_%.bbappend
+++ b/recipes-graphics/waffle/waffle_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:imxgpu := "${THISDIR}/${PN}:"
-SRC_URI += " \
+SRC_URI:append:imxgpu = " \
    file://0001-meson-Add-missing-wayland-dependency-on-EGL.patch \
    file://0002-meson-Separate-surfaceless-option-from-x11.patch \
 "
diff --git a/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch b/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch
index ed649e231..82c99d524 100644
--- a/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch
+++ b/recipes-graphics/wayland/wayland-protocols/0001-unstable-Add-alpha-compositing-protocol.patch
@@ -28,14 +28,14 @@ Conflicts:
 create mode 100644 unstable/alpha-compositing/alpha-compositing-unstable-v1.xml
 diff --git a/meson.build b/meson.build
-index a78d698a730b..99a555d53a09 100644
+index 25d42ce..4eb37f0 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -42,6 +42,7 @@ unstable_protocols = {
+@@ -45,6 +45,7 @@ unstable_protocols = {
-        'xdg-output': ['v1'],
+        'xdg-output': {'v1': []},
-        'xdg-shell': ['v5', 'v6'],
+        'xdg-shell': {'v5': [], 'v6': []},
-        'xwayland-keyboard-grab': ['v1'],
+        'xwayland-keyboard-grab': {'v1': []},
-+       'alpha-compositing': ['v1'],
+       'alpha-compositing': {'v1': []},
 }
 
 staging_protocols = {
diff --git a/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch b/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch
index 7711fed60..0c021f37c 100644
--- a/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch
+++ b/recipes-graphics/wayland/wayland-protocols/0002-unstable-Add-hdr10-metadata-protocol.patch
@@ -19,14 +19,14 @@ Signed-off-by: Haihua Hu <jared.hu@nxp.com>
 create mode 100644 unstable/hdr10-metadata/hdr10-metadata-unstable-v1.xml
 diff --git a/meson.build b/meson.build
-index 99a555d53a09..70b594d3b89c 100644
+index 4eb37f0..c131e95 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -43,6 +43,7 @@ unstable_protocols = {
+@@ -46,6 +46,7 @@ unstable_protocols = {
-        'xdg-shell': ['v5', 'v6'],
+        'xdg-shell': {'v5': [], 'v6': []},
-        'xwayland-keyboard-grab': ['v1'],
+        'xwayland-keyboard-grab': {'v1': []},
-        'alpha-compositing': ['v1'],
+        'alpha-compositing': {'v1': []},
-+       'hdr10-metadata': ['v1'],
+       'hdr10-metadata': {'v1': []},
 }
 
 staging_protocols = {
diff --git a/recipes-graphics/wayland/wayland-protocols_%.bbappend b/recipes-graphics/wayland/wayland-protocols_%.bbappend
index c82b46568..762b47a31 100644
--- a/recipes-graphics/wayland/wayland-protocols_%.bbappend
+++ b/recipes-graphics/wayland/wayland-protocols_%.bbappend
@@ -6,11 +6,11 @@ NXP_PATCHES = " \
    file://0003-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch \
 "
-SRC_URI:append:imx-nxp-bsp = " ${NXP_PATCHES}"
+SRC_URI:append:imx-nxp-bsp:class-target = " ${NXP_PATCHES}"
 # override the effect of "inherit allarch"
-python allarch_package_arch_handler:prepend:imx-nxp-bsp () {
+python allarch_package_arch_handler:prepend:imx-nxp-bsp:class-target () {
    return
 }
-PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH:imx-nxp-bsp:class-target = "${MACHINE_SOCARCH}"
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 27a5b947b..1b08b1955 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -45,6 +45,7 @@ PACKAGECONFIG_USE_G2D:mx8qm-nxp-bsp  ?= ""
 PACKAGECONFIG_USE_G2D:mx8qxp-nxp-bsp ?= ""
 PACKAGECONFIG_USE_G2D:mx8dx-nxp-bsp  ?= ""
 PACKAGECONFIG_USE_G2D:mx93-nxp-bsp   ?= "use-g2d"
+PACKAGECONFIG_USE_G2D:mx943-nxp-bsp   ?= "use-g2d"
 USE_G2D_VALUE             = "true"
 USE_G2D_VALUE:mx6-nxp-bsp = "1"
@@ -57,6 +58,18 @@ PACKAGECONFIG[size] = ",,"
 PACKAGECONFIG[use-g2d] = ",,"
 PACKAGECONFIG[xwayland] = ",,"
+update_file() {
+    sed -i -e "s,$1,$2," $3
+}
+insert_line_before() {
+    sed -i -e "/$1/i $2" $3
+}
+insert_line_after() {
+    sed -i -e "/$1/a $2" $3
+}
 do_install:append() {
    # Replace the template variables
    sed -i -e 's,@bindir@,${bindir},g' ${D}${sysconfdir}/xdg/weston/weston.ini
@@ -91,4 +104,35 @@ do_install:append() {
    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "no" ]; then
        sed -i -e "s/^xwayland=true/#xwayland=true/g" ${D}${sysconfdir}/xdg/weston/weston.ini
    fi
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        # Add weston.log back, used by NXP for testing
+        update_file "ExecStart=/usr/bin/weston " "ExecStart=/usr/bin/weston --log=\$\{XDG_RUNTIME_DIR\}/weston.log " ${D}${systemd_system_unitdir}/weston.service
+        # FIXME: weston should be run as weston, not as root
+        update_file "User=weston" "User=root" ${D}${systemd_system_unitdir}/weston.service
+        update_file "Group=weston" "Group=root" ${D}${systemd_system_unitdir}/weston.service
+        # FIXME: Upstream this change
+        insert_line_before "ExecStart=" "ExecStartPre=+chvt 7" ${D}${systemd_system_unitdir}/weston.service
+        # FIXME: fix the underlying problem and drop this workaround
+        insert_line_after "ExecStart=" "Restart=on-failure" ${D}${systemd_system_unitdir}/weston.service
+    else
+        # Install weston-socket.sh for sysvinit as well
+        install -D -p -m0644 ${S}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh
+    fi
+    # Include commented gbm-format
+    if ! [ "${@bb.utils.contains('PACKAGECONFIG', 'gbm-format', 'yes', 'no', d)}" = "yes" ]; then
+        sed -i -e "/^\[core\]/a #gbm-format=${GBM_FORMAT_VALUE}" ${D}${sysconfdir}/xdg/weston/weston.ini
+    fi
+}
+do_install:append:mx6-nxp-bsp() {
+    update_file "--no-resizeable" "--no-clients-resize" ${D}${sysconfdir}/xdg/weston/weston.ini
+}
+do_install:append:mx7-nxp-bsp() {
+    update_file "--no-resizeable" "--no-clients-resize" ${D}${sysconfdir}/xdg/weston/weston.ini
 }
diff --git a/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
index 19e6ad244..d865ef773 100644
--- a/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
+++ b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
@@ -21,5 +21,5 @@ touchscreen_calibrator=true
 #transform=rotate-90
 [screen-share]
-command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize
+command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-resizeable
 #start-on-startup=true
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index 4d7d99130..991650fb9 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -161,11 +161,12 @@ LIC_FILES_CHKSUM:append = "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
 DEFAULT_PREFERENCE = "-1"
 SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz"
-SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} "
+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 \
            file://0001-g2d-renderer.c-Include-sys-stat.h.patch"
 SRCBRANCH = "weston-imx-10.0.5"
-SRCREV = "7129417ae04de57f9596ccf27f74ef967660a64f"
+SRCREV = "5223a3c86177709d25f86a96622c0829da955a0e"
 # Disable OpenGL for parts with GPU support for 2D but not 3D
 REQUIRED_DISTRO_FEATURES          = "opengl"
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index 299796f3b..2c0b13d41 100644
--- a/recipes-graphics/wayland/weston_14.0.2.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -163,17 +163,21 @@ SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}
 SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
 WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
 SRCBRANCH = "weston-imx-14.0.2"
-SRCREV = "c267ba8e6eed3a824e042a200bcc1b4c370ba88f"
+SRCREV = "be99fd1adad7e77c8c31926b09520ade5cdaca35"
 PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
-PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
+PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D} ${PACKAGECONFIG_PIPEWIRE}"
 PACKAGECONFIG_G2D               ??= ""
 PACKAGECONFIG_G2D:imxgpu2d      ??= "imxg2d"
 PACKAGECONFIG_G2D:mx93-nxp-bsp  ??= "imxg2d"
 PACKAGECONFIG_G2D:mx943-nxp-bsp ??= "imxg2d"
+PACKAGECONFIG_PIPEWIRE             ??= ""
+PACKAGECONFIG_PIPEWIRE:mx8-nxp-bsp ??= "pipewire"
+PACKAGECONFIG_PIPEWIRE:mx9-nxp-bsp ??= "pipewire"
 # Weston with i.MX G2D renderer
 PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
diff --git a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend
index d8f5bdde5..d8f5bdde5 100644
--- a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend
+++ b/recipes-graphics/xwayland/xwayland_%.bbappend
diff --git a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
deleted file mode 100644
index 1d7ee80f6..000000000
--- a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-# This recipe copy helps keep meta-freescale master branch compatible
-# with Yocto walnascar.
-# (From OE-Core rev: 737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7)
-SUMMARY = "XWayland is an X Server that runs under Wayland."
-DESCRIPTION = "XWayland is an X Server running as a Wayland client, \
-and thus is capable of displaying native X11 client applications in a \
-Wayland compositor environment. The goal of XWayland is to facilitate \
-the transition from X Window System to Wayland environments, providing \
-a way to run unported applications in the meantime."
-HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone"
-DEFAULT_PREFERENCE = "-1"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
-SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz"
-BP_ORIGINAL = "${BPN}-24.1.6"
-SRC_URI[sha256sum] = "737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7"
-S = "${UNPACKDIR}/${BP_ORIGINAL}"
-UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
-inherit meson features_check pkgconfig
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
-DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt libtirpc"
-OPENGL_PKGCONFIGS = "glx glamor dri3"
-PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
-"
-PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence"
-PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor"
-PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11"
-PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl"
-PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
-PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false"
-# Xorg requires a SHA1 implementation, pick one
-XORG_CRYPTO ??= "openssl"
-PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl"
-PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle"
-PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt"
-XWAYLAND_EI ??= "xwayland_ei_false"
-PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false"
-PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei"
-PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei"
-do_install:append() {
-    # remove files not needed and clashing with xserver-xorg
-    rm -rf ${D}/${libdir}/xorg/
-}
-FILES:${PN} += "${libdir}/xorg/protocol.txt"
-RDEPENDS:${PN} += "xkbcomp"
-CVE_STATUS_GROUPS = "CVE_STATUS_REDHAT"
-CVE_STATUS_REDHAT = "CVE-2025-26594 CVE-2025-26595 CVE-2025-26596 CVE-2025-26597 CVE-2025-26598 CVE-2025-26599 CVE-2025-26600 CVE-2025-26601"
-CVE_STATUS_REDHAT[status] = "fixed-version: these are tracked as versionless redhat CVEs in NVD DB, fixed in 24.1.6"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.4.bb
index dc0f2886f..5dc9ab894 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.4.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2016 Freescale Semiconductor
-# Copyright (C) 2017-2025 NXP
+# Copyright (C) 2017-2026 NXP
 SUMMARY = "Kernel loadable module for Vivante GPU"
 DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
@@ -7,15 +7,12 @@ 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=${BP}/src \
+SRC_URI = "${LINUX_IMX_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/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"
+SRCBRANCH = "lf-6.18.y"
-LOCALVERSION = "-lts-${SRCBRANCH}"
+LOCALVERSION = "-6.18.2-1.0.0"
-SRCREV = "807e28f65f46b131a698a4c62e2cc0b6b4682731"
+SRCREV = "b9ab260bee4d15d079e39a373162eb6201c1cb4a"
-S = "${UNPACKDIR}/${BP}"
 inherit module
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam/0001-video-add-v4l2-fh-compat-for-pre-6.18-kernels.patch b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam/0001-video-add-v4l2-fh-compat-for-pre-6.18-kernels.patch
new file mode 100644
index 000000000..4a784eee2
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam/0001-video-add-v4l2-fh-compat-for-pre-6.18-kernels.patch
@@ -0,0 +1,88 @@
+From 35d5a732cc4b53897a0e6188fae5e9c8fd1b97a1 Mon Sep 17 00:00:00 2001
+From: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
+Date: Mon, 11 May 2026 16:00:30 +0000
+Subject: [PATCH] video: add v4l2_fh compat for pre-6.18 kernels
+Linux v6.18 added file_to_v4l2_fh() and changed v4l2_fh_add() and
+v4l2_fh_del() to take the file pointer so the helpers can manage
+file->private_data internally.
+The relevant upstream commits are:
+  618882c92681 ("media: Wrap file->private_data access with a helper function")
+  47f4b1acb4d5 ("media: Set file->private_data in v4l2_fh_add()")
+  277966749f46 ("media: Reset file->private_data to NULL in v4l2_fh_del()")
+Add a small compatibility layer for older kernels that keeps
+file->private_data management in this driver.
+Upstream-Status: Inappropriate
+Signed-off-by: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
+---
+ video/video.c | 30 +++++++++++++++++++++++++++---
+ 1 file changed, 27 insertions(+), 3 deletions(-)
+diff --git a/video/video.c b/video/video.c
+index bccf466b05f5..ce8c7d725150 100644
+--- a/video/video.c
+++ b/video/video.c
+@@ -69,6 +69,30 @@
+ #include "vvdefs.h"
+ #include "vvsensor.h"
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 18, 0)
+static inline struct v4l2_fh *viv_file_to_v4l2_fh(struct file *file)
+{
+       return file->private_data;
+}
+
+static inline void viv_v4l2_fh_add(struct v4l2_fh *fh, struct file *file)
+{
+       file->private_data = fh;
+       v4l2_fh_add(fh);
+}
+
+static inline void viv_v4l2_fh_del(struct v4l2_fh *fh, struct file *file)
+{
+       v4l2_fh_del(fh);
+       file->private_data = NULL;
+}
+
+#define file_to_v4l2_fh(file) viv_file_to_v4l2_fh(file)
+#else
+#define viv_v4l2_fh_add(fh, file) v4l2_fh_add(fh, file)
+#define viv_v4l2_fh_del(fh, file) v4l2_fh_del(fh, file)
+#endif
+
+ #define DEF_PLANE_NO    (0)
+ 
+ static struct viv_video_device *vvdev[VIDEO_NODE_NUM];
+@@ -573,7 +597,7 @@ static int video_open(struct file *file)
+        handle = kzalloc(sizeof(*handle), GFP_KERNEL);
+ 
+        v4l2_fh_init(&handle->vfh, dev->video);
+-       v4l2_fh_add(&handle->vfh, file);
+       viv_v4l2_fh_add(&handle->vfh, file);
+ 
+        handle->vdev = dev;
+        handle->queue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+@@ -589,7 +613,7 @@ static int video_open(struct file *file)
+        rc = vb2_queue_init(&handle->queue);
+        if (rc) {
+                pr_err("can't init vb queue\n");
+-               v4l2_fh_del(&handle->vfh, file);
+               viv_v4l2_fh_del(&handle->vfh, file);
+                v4l2_fh_exit(&handle->vfh);
+                kfree(handle);
+                return rc;
+@@ -654,7 +678,7 @@ static int video_close(struct file *file)
+                                vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
+                }
+ 
+-               v4l2_fh_del(&handle->vfh, file);
+               viv_v4l2_fh_del(&handle->vfh, file);
+                v4l2_fh_exit(&handle->vfh);
+ 
+                {
+-- 
+2.43.0
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..dfe55bc80
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
@@ -0,0 +1,24 @@
+# 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} \
+           file://0001-video-add-v4l2-fh-compat-for-pre-6.18-kernels.patch \
+"
+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/0001-mlinux-moal_main-fix-device-wakeup-capability.patch b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-mlinux-moal_main-fix-device-wakeup-capability.patch
new file mode 100644
index 000000000..41ac4007a
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-mlinux-moal_main-fix-device-wakeup-capability.patch
@@ -0,0 +1,52 @@
+From 6342842b69302ad5530b07d8390102b0648f4b9a Mon Sep 17 00:00:00 2001
+From: Franz Schnyder <franz.schnyder@toradex.com>
+Date: Thu, 21 May 2026 11:29:47 +0200
+Subject: [PATCH] mlinux: moal_main: fix device wakeup capability
+Currently, the device is always advertised as being capable of
+waking up, even if no interrupt line has been allocated for it.
+Initialize the device only as wakeup capable if an interrupt has been
+registered.
+Upstream-Status: Pending
+Signed-off-by: Franz Schnyder <franz.schnyder@toradex.com>
+---
+ mlinux/moal_main.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+diff --git a/mlinux/moal_main.c b/mlinux/moal_main.c
+index 0214fc3..2d765b8 100644
+--- a/mlinux/moal_main.c
+++ b/mlinux/moal_main.c
+@@ -14331,6 +14331,11 @@ void woal_regist_oob_wakeup_irq(moal_handle *handle)
+                goto err_exit;
+        }
+ 
+       if (device_init_wakeup(dev, true)) {
+               dev_err(dev, "Failed to init wakeup for mwifiex\n");
+               goto err_exit;
+       }
+
+        disable_irq(handle->irq_oob_wakeup);
+ 
+        LEAVE();
+@@ -14353,6 +14358,7 @@ void woal_unregist_oob_wakeup_irq(moal_handle *handle)
+ 
+        ENTER();
+        if (handle->irq_oob_wakeup >= 0) {
+               device_init_wakeup(dev, false);
+                devm_free_irq(dev, handle->irq_oob_wakeup, handle);
+        }
+        LEAVE();
+@@ -14829,7 +14835,6 @@ moal_handle *woal_add_card(void *card, struct device *dev, moal_if_ops *if_ops,
+                PRINTM(MFATAL, "Firmware Init Failed\n");
+                goto err_init_fw;
+        }
+-       device_init_wakeup(dev, true);
+ #ifdef SD8887
+        if (IS_SD8887(handle->card_type)) {
+                if (handle->fw_release_number.minorRevNum == 75) {
+-- 
+2.43.0
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..d22b643c7 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,13 @@ 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 \
+    file://0001-mlinux-moal_main-fix-device-wakeup-capability.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
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.12.bb b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
index b3b0f190f..229ec1dcb 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.12.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
@@ -28,12 +28,12 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v6.12.3
+#    tag: v6.18.24
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: lf-6.12.3-1.0.0
+#    tag: lf-6.18-1.0.x-imx
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
@@ -42,22 +42,15 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # conflicts, prioritizing NXP BSP source code as the latest vendor updates.
 # Additional commits may exist to better acommodate yocto builds.
 #
-# $ git log --oneline  --no-merges v6.12.49.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y
+# $ git log --oneline  --no-merges v6.18.24.. ^mainline/linux-6.18.y ^NXP/lf-6.18.y
-# - bacd5504126bb imx8mp-olimex.dts: CSI GPIO pins
+# - 6e811374f6340 drm/imx: lcdifv3: Fix videomode settings
-# - 3a7012e991c98 hwrng: optee: support generic crypto
+# - 40b594773feaf drm: of: Fix build without CONFIG_OF
-# - 6c0a3377748eb arm64: dts: imx8mq: drop cpu-idle-states
+# - 40d5cc16c304a arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
-# - 7db0692d9ff5e of: enable using OF_DYNAMIC without OF_UNITTEST
+# - eff109d884f3b gpu: drm: cadence: select hdmi helper
-# - eff98b934385c gpu: drm: cadence: select hdmi helper
+# - ddfe8741dab43 of: enable using OF_DYNAMIC without OF_UNITTEST
-# - be5e175e43d93 imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error
+# - 1b982f1a29bbc arm64: dts: imx8mq: drop cpu-idle-states
-# - 76e18f5a57b3e arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
+# - de4b96e987407 hwrng: optee: support generic crypto
-# - 06b99391f850c drm: of: Fix build without CONFIG_OF
-# - 17ac89e381a9d i2c: imx: Remove unnecessary clock reconfiguration
-# - 6d157e81ccc53 drm/imx: lcdifv3: Fix videomode settings
-# - 0a355239e2df3 clk: imx: imx8qm: add more resources to whitelist
-# - c5c4869899b1c arm64: dts: imx8: img: add #address-cells and #size-cells to I2C MIPI CSI nodes
-# - 3159e7d086295 arm64: dts: imx8qm: add missing imx8-ss-cm40.dtsi include
-# - ffea393034d48 arm64: imx_v8_defconfig: Enable CONFIG_GPIO_VF610
-# - a8762ad609202 imx8mp-olimex.dts: Olimex iMX8MP-SOM-EVB-IND
 #
 # NOTE to upgraders:
 # This recipe should NOT collect individual patches, they should be applied to
@@ -67,16 +60,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 require linux-imx.inc
-KBRANCH = "6.12-2.0.x-imx"
+KBRANCH = "6.18-1.0.x-imx"
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-SRCREV = "77b58422ab0fa4480a0b89a5f1ebfb9d1a900aef"
+SRCREV = "1d08c2fc5b376a84a3e7092651289fb8e8ffc1af"
 # 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"
+LINUX_VERSION = "6.18.24"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
@@ -84,7 +77,7 @@ KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig"
 KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig"
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
-LOCALVERSION = "-lf-6.12.y"
+LOCALVERSION = "-lf-6.18.y"
 DEFAULT_PREFERENCE = "1"
diff --git a/recipes-kernel/linux/linux-imx-headers/0001-ipu-uapi-Do-not-redefine-standard-integer-types.patch b/recipes-kernel/linux/linux-imx-headers/0001-ipu-uapi-Do-not-redefine-standard-integer-types.patch
new file mode 100644
index 000000000..cf2b95f74
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-headers/0001-ipu-uapi-Do-not-redefine-standard-integer-types.patch
@@ -0,0 +1,42 @@
+From 76a44c7b7913daf987a315f77f0c0b1e67a71aeb Mon Sep 17 00:00:00 2001
+From: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
+Date: Thu, 30 Apr 2026 10:52:00 +0200
+Subject: [PATCH] ipu: uapi: Do not redefine standard integer types
+The exported IPU UAPI header defines uint32_t, uint16_t and uint8_t as
+preprocessor macros. This breaks userspace builds when another header is
+included afterwards and uses the standard integer type names, because
+the macros rewrite those declarations.
+The header itself only needs the local u32 and u8 aliases. Keep those
+aliases mapped to the __u32 and __u8 types provided by linux/types.h,
+and leave the standard uint*_t namespace untouched.
+Upstream-Status: Submitted [https://community.nxp.com/t5/i-MX-Processors/linux-imx-include-uapi-linux-ipu-h-redefines-standard-integer/m-p/2359396]
+Signed-off-by: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
+---
+ include/uapi/linux/ipu.h | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+diff --git a/include/uapi/linux/ipu.h b/include/uapi/linux/ipu.h
+index 7bdac34bd1f0..e49430b0c938 100644
+--- a/include/uapi/linux/ipu.h
+++ b/include/uapi/linux/ipu.h
+@@ -38,12 +38,8 @@ typedef unsigned char bool;
+ #endif
+ #define irqreturn_t int
+ #define dma_addr_t int
+-#define uint32_t unsigned int
+-#define uint16_t unsigned short
+-#define uint8_t unsigned char
+-#define u32 unsigned int
+-#define u8 unsigned char
+-#define __u32 u32
+#define u32 __u32
+#define u8 __u8
+ #endif
+ 
+ /*!
+-- 
+2.43.0
diff --git a/recipes-kernel/linux/linux-imx-headers_6.18.bb b/recipes-kernel/linux/linux-imx-headers_6.18.bb
index c6a3786c9..b6d7f8eb8 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.18.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.18.bb
@@ -7,7 +7,9 @@ New headers are installed in ${includedir}/imx."
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRC_URI = "${LINUX_IMX_SRC}"
+SRC_URI = "${LINUX_IMX_SRC} \
+           file://0001-ipu-uapi-Do-not-redefine-standard-integer-types.patch \
+"
 LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-6.18.y"
 LOCALVERSION = "-lts-${SRCBRANCH}"
diff --git a/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack/0001-ethosu.hpp-Fix-gcc15-build-issues.patch b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack/0001-ethosu.hpp-Fix-gcc15-build-issues.patch
new file mode 100644
index 000000000..c5a0bc1cb
--- /dev/null
+++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack/0001-ethosu.hpp-Fix-gcc15-build-issues.patch
@@ -0,0 +1,32 @@
+From f1e283f16dc6d38552be6e691fbb2eed32a560cc Mon Sep 17 00:00:00 2001
+From: Markus Niebel <Markus.Niebel@ew.tq-group.com>
+Date: Tue, 19 May 2026 17:50:31 +0200
+Subject: [PATCH] ethosu.hpp: Fix gcc15 build issues
+https://gcc.gnu.org/gcc-15/porting_to.html#cxx
+Some C++ Standard Library headers are no longer
+including other headers that were being used
+internally by the library.
+Upstream-Status: Pending
+Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
+---
+ driver_library/include/ethosu.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/driver_library/include/ethosu.hpp b/driver_library/include/ethosu.hpp
+index f8f7598..977a716 100644
+--- a/driver_library/include/ethosu.hpp
+++ b/driver_library/include/ethosu.hpp
+@@ -19,6 +19,7 @@
+ #pragma once
+ 
+ #include <algorithm>
+#include <cstdint>
+ #include <iostream>
+ #include <memory>
+ #include <string>
+-- 
+2.43.0
diff --git a/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb
index ae762cb9a..b3aae7d46 100644
--- a/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb
+++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb
@@ -8,10 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
 DEPENDS = "flatbuffers python3-pybind11 python3-pybind11-native"
-SRC_URI = "${ETHOS_U_SRC};branch=${SRCBRANCH}"
+SRC_URI = "${ETHOS_U_SRC};branch=${SRCBRANCH} \
+    file://0001-ethosu.hpp-Fix-gcc15-build-issues.patch \
+"
 ETHOS_U_SRC ?= "git://github.com/nxp-imx/ethos-u-driver-stack-imx.git;protocol=https"
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.18.2_1.0.0"
-SRCREV = "a80c51d77c91f1a8266afc5d8056fb981de4b504"
+SRCREV = "94658d758ef1116e574aa7cf16f96c9546fe932e"
 inherit cmake setuptools3
diff --git a/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb b/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb
index 1f16dce90..7a6fb5aa7 100644
--- a/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb
+++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "\
 SRC_URI = "${ETHOS_U_FIRMWARE_SRC};branch=${SRCBRANCH}"
 ETHOS_U_FIRMWARE_SRC ?= "git://github.com/nxp-imx/ethos-u-firmware.git;protocol=https"
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.18.2_1.0.0"
-SRCREV = "3dbedc11bd2a4ba56af9fbe9d285b5bf13f1a088"
+SRCREV = "5c14790b7ed63a52afd2ba6d917070e4c7b4265e"
 ETHOS_U_FIRMWARE = "ethosu_firmware"
 ETHOS_U_FIRMWARE:imx93-9x9-lpddr4-qsb    = "ethosu_firmware_9x9"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index d38e97e8f..fabbbb4ff 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 Freescale Semiconductor
-# Copyright 2017-2025 NXP
+# Copyright 2017-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale alsa-lib plugins"
@@ -19,9 +19,10 @@ 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}"
+SRC_URI = "${IMXALSA_SRC};branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+IMXALSA_SRC ?= "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https"
-SRCREV = "40e45c8023f95c06c4ea10185ca85db7eb2dfcd8"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "18eb79b6cf13fb988de7d4eef5b22eb60f8e2533"
 CFLAGS:append = " -I${STAGING_INCDIR_IMX}"
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb
index 9a619f5a0..ddbe334db 100644
--- a/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb
@@ -6,13 +6,13 @@ SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${@get_gst_ver("${PV}")}.tar.xz \
+#S = "${WORKDIR}/gst-devtools-${PV}"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}.tar.xz \
           file://0001-connect-has-a-different-signature-on-musl.patch \
           "
-S = "${UNPACKDIR}/gst-devtools-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "dec8fc56d578d65c498e65e56efe44994c5d3f4e85dbbdff0242b441b32e19b2"
-SRC_URI[sha256sum] = "eff33d7dc292bb074a2788ea887b6283398ffdefafa49fb7d08efe6658a65648"
 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS:${PN} = "git"
@@ -40,9 +40,6 @@ EXTRA_OEMESON += " \
    -Dvalidate=enabled \
    ${@gettext_oemeson(d)} \
 "
-# Drop .imx from PV
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 do_install:append () {
     for fn in ${bindir}/gst-validate-launcher \
@@ -53,3 +50,10 @@ do_install:append () {
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
+########### i.MX overrides ################
+EXTRA_OEMESON:append:mx93-nxp-bsp = " -Dintrospection=disabled "
+EXTRA_OEMESON:append:mx943-nxp-bsp = " -Dintrospection=disabled "
+########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
index 9db0051a1..2b31df7df 100644
--- a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
@@ -1,8 +1,8 @@
-# This builds an older version which is compatible with the gstreamer NXP fork 1.24.7.imx,
+#copy from openembedded-core layer: https://github.com/openembedded/openembedded-core/blob/whinlatter/meta/recipes-multimedia/gstreamer
-# thus the version is appended with '.imx'
+# downgrade version to compatible imx gstreamer version
 SUMMARY = "GStreamer examples (including gtk-play, gst-play)"
-DESCRIPTION = "GStreamer example applications."
+DESCRIPTION = "GStreamer example applications"
 HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples"
 BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues"
 LICENSE = "LGPL-2.0-or-later"
@@ -10,18 +10,21 @@ LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20
 DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 json-glib glib-2.0-native"
-SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.24 \
+SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.26;tag=${PV} \
           file://0001-Make-player-examples-installable.patch \
           file://gst-player.desktop \
           "
-SRCREV = "0f1e984e41ce8d6d0758265d35e8b10d5815fde2"
+SRCREV = "6cbdcfaca66dd52cdc4670d6f5122c68b9161170"
 S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
 inherit meson pkgconfig features_check
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
+# gtk-play has runtime errors otherwise
+TARGET_LDFLAGS += "-rdynamic"
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb b/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
new file mode 100644
index 000000000..96a7ce6ab
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
@@ -0,0 +1,25 @@
+# Copyright (C) 2017 NXP Semiconductor
+SUMMARY = "RTSP server for live-stream from a v4l2 video source"
+HOMEPAGE = "https://github.com/Gateworks/gst-gateworks-apps"
+SECTION = "multimedia"
+LICENSE = "GPL-3.0-only"
+inherit pkgconfig
+DEPENDS = "gstreamer1.0 gstreamer1.0-rtsp-server glib-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+SRC_URI = " \
+    git://github.com/Gateworks/gst-gateworks-apps;branch=master;protocol=https \
+"
+SRCREV = "490564815d8049dbdd79087f546835b673ba6e88"
+do_install() {
+    install -m 0755 -D ${S}/bin/gst-variable-rtsp-server \
+        ${D}/${bindir}/gst-variable-rtsp-server
+}
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb
index 138398d85..e7a4a7dea 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb
@@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
                    "
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
-SRC_URI[sha256sum] = "707a8b687ff5fddcee5b02415e2ec9b71b4ac44d0b7aec3b477364ceecbf1ecf"
+SRC_URI[sha256sum] = "6e50a6222d509c52b19143f9a7bd3581e22c745d0c4bc27ddb07e1229bcc11b8"
-S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/gst-libav-${PV}"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
@@ -24,11 +24,5 @@ EXTRA_OEMESON += " \
    -Dtests=disabled \
 "
-# Drop .imx from PV
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
 FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch
new file mode 100644
index 000000000..38282e478
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch
@@ -0,0 +1,30 @@
+From 71b5b04685e6b03b7e2325fed22c83d9c6300f65 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Fri, 6 Feb 2026 17:32:34 +0900
+Subject: [PATCH] MMFMWK-9590 gstcuda: disable gir build for cuda plugin
+ libraries
+This is a workaround to only disable cuda gir build to avoid totally
+disable bad library gir build. mesa-rvgpu-emu patch break cuda gir build
+Upstream-Status: Inappropriate [i.MX specific]
+---
+ gst-libs/gst/cuda/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/gst-libs/gst/cuda/meson.build b/gst-libs/gst/cuda/meson.build
+index 50ae0276ce..5e8a3d209b 100644
+--- a/gst-libs/gst/cuda/meson.build
+++ b/gst-libs/gst/cuda/meson.build
+@@ -157,7 +157,7 @@ gstcuda= library('gstcuda-' + api_version,
+ 
+ gen_sources = []
+ library_def = {'lib': gstcuda}
+-if build_gir
+if false
+   gir_includes = ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', 'CudaGst-1.0']
+   if gstglproto_dep.found()
+     gir_includes += ['GstGL-1.0']
+-- 
+2.34.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
new file mode 100644
index 000000000..029b80e17
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
@@ -0,0 +1,33 @@
+From 3bc5d48257032b6bbee532aad15062fbbcc43bfe Mon Sep 17 00:00:00 2001
+From: Andrey Zhizhikin <andrey.z@gmail.com>
+Date: Mon, 27 Jan 2020 10:22:35 +0000
+Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
+When Yocto build is performed, opencv searches for data dir using simple
+'test' command, this fails because pkg-config provides an absolute
+path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR
+in order for the 'test' utility to pick up the absolute path.
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
+Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
+---
+ ext/opencv/meson.build | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
+index 1d86b90..b5c8b95 100644
+--- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build
+@@ -87,6 +87,9 @@ if opencv_found
+   opencv_prefix = opencv_dep.get_variable('prefix')
+   gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
+ 
+  pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
+  opencv_prefix = pkgconf_sysroot + opencv_prefix
+
+   # Check the data dir used by opencv for its xml data files
+   # Use prefix from pkg-config to be compatible with cross-compilation
+   r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
index 1c4ee72d0..36db56eb8 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
@@ -5,8 +5,8 @@
 ########### OE-core copy ##################
 # Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
-require gstreamer1.0-plugins-license.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
 SUMMARY = "'Bad' GStreamer plugins and helper libraries "
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -19,8 +19,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
           "
 SRC_URI[sha256sum] = "e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c"
-S = "${WORKDIR}/gst-plugins-bad-${PV}"
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
@@ -181,16 +179,18 @@ DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
-                   file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
+           file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
-                   file://0002-avoid-including-sys-poll.h-directly.patch \
+           file://0002-avoid-including-sys-poll.h-directly.patch \
-                   file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
+           file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
-                   "
+           "
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
-GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "4320364e6be53cae81ac2bca3ce0e09cf8707590"
-S = "${UNPACKDIR}/${BP}"
+SRC_URI:append:mx93-nxp-bsp = "file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
+SRC_URI:append:mx943-nxp-bsp = "file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
+GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "81b6888efe936153b88c32b22a12d60bf9395054"
 inherit use-imx-headers
@@ -202,6 +202,8 @@ PACKAGECONFIG_REMOVE ?= " \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'gl', d)} \
 "
 PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
+PACKAGECONFIG:remove:mx93-nxp-bsp = "gl"
+PACKAGECONFIG:remove:mx943-nxp-bsp = "gl"
 PACKAGECONFIG:append:mx8-nxp-bsp = " kms tinycompress"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
@@ -220,4 +222,5 @@ EXTRA_OEMESON:remove = " \
 "
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
 ########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch
new file mode 100644
index 000000000..3f709d84f
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch
@@ -0,0 +1,67 @@
+From f85821d405ba287acc01b1c80205470f086b3d61 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Fri, 6 Feb 2026 15:12:52 +0900
+Subject: [PATCH 1/5] MMFMWK-9590 gstgl-1.0: disable gir build for gl plugin
+ libraries
+This is a workaround to only display gl gir build to avoid totally
+disable base library gir build. mesa-rvgpu-emu patch break gl gir
+build
+Upstream-Status: Inappropriate [i.MX specific]
+---
+ gst-libs/gst/gl/meson.build | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
+index 837cf484e..ef981c8e3 100644
+--- a/gst-libs/gst/gl/meson.build
+++ b/gst-libs/gst/gl/meson.build
+@@ -1193,7 +1193,7 @@ if build_gstgl
+     description : 'Streaming media framework, OpenGL plugins libraries (OpenGL Prototypes)',
+   )
+ 
+-  if build_gir
+  if false
+     gir = {
+         'sources' : gl_sources + [gl_enumtypes_h] + [gl_enumtypes_c] + gir_gl_headers,
+         'namespace' : 'GstGL',
+@@ -1239,7 +1239,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (X11 specifics)',
+     )
+     gl_x11_gir = []
+-    if build_gir
+    if false
+ 
+       doc_sources = []
+       foreach s: gl_x11_sources + gl_x11_headers
+@@ -1286,7 +1286,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (Wayland specifics)',
+     )
+     gl_wayland_gir = []
+-    if build_gir
+    if false
+       doc_sources = []
+       foreach s: gl_wayland_sources + gl_wayland_headers
+         doc_sources += s.full_path()
+@@ -1331,7 +1331,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (EGL specifics)',
+     )
+     gl_egl_gir = []
+-    if build_gir
+    if false
+       gir = {
+         'sources' : gl_egl_sources + gl_egl_headers,
+         'namespace' : 'GstGLEGL',
+@@ -1367,7 +1367,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (Vivante Framebuffer specifics)',
+     )
+     gl_viv_fb_gir = []
+-    if build_gir
+    if false
+       gir = {
+         'sources' : gl_viv_fb_sources + gl_viv_fb_headers,
+         'namespace' : 'GstGLVivFB',
+-- 
+2.34.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
index 5c2492638..0cfa8c064 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
@@ -5,7 +5,7 @@
 ########### OE-core copy ##################
 # Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
 SUMMARY = "'Base' GStreamer plugins and helper libraries"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -20,8 +20,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
           "
 SRC_URI[sha256sum] = "edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a"
-S = "${WORKDIR}/gst-plugins-base-${PV}"
 DEPENDS += "iso-codes util-linux zlib"
 inherit gobject-introspection
@@ -117,11 +115,12 @@ SRC_URI:remove = " \
    file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 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"
+SRC_URI:append:mx93-nxp-bsp = "file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRC_URI:append:mx943-nxp-bsp = "file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
-SRCREV = "bbe6aa6f5b666fda0b172c3e1f417c7eadb16549"
-S = "${UNPACKDIR}/${BP}"
+GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "48718c61610e3628f3f162bb8d84ae213ae8516f"
 inherit use-imx-headers
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bbappend
index 528d7e1a3..528d7e1a3 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bbappend
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
deleted file mode 100644
index 54dd92873..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-# This .inc file contains the common setup for the gstreamer1.0-plugins-*
-# plugin set recipes.
-# SUMMARY is set in the actual .bb recipes
-HOMEPAGE = "https://gstreamer.freedesktop.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
-SECTION = "multimedia"
-DEPENDS = "gstreamer1.0 glib-2.0-native"
-inherit gettext meson pkgconfig upstream-version-is-even
-require gstreamer1.0-plugins-packaging.inc
-# Orc enables runtime JIT compilation of data processing routines from Orc
-# bytecode to SIMD instructions for various architectures (currently SSE, MMX,
-# MIPS, Altivec and NEON are supported).
-# This value is used in the PACKAGECONFIG values for each plugin set recipe.
-# By modifying it, Orc can be enabled/disabled in all of these recipes at once.
-GSTREAMER_ORC ?= "orc"
-# workaround to disable orc on mips to fix the build failure
-# {standard input}: Assembler messages:
-# {standard input}:46587: Error: branch out of range
-GSTREAMER_ORC:mips = ""
-PACKAGECONFIG[orc] = "-Dorc=enabled,-Dorc=disabled,orc orc-native"
-# TODO: put this in a gettext.bbclass patch (with variables to allow for
-# configuring the option name and the enabled/disabled values).
-def gettext_oemeson(d):
-    if d.getVar('USE_NLS') == 'no':
-        return '-Dnls=disabled'
-    # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
-    if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'):
-        return '-Dnls=disabled'
-    return '-Dnls=enabled'
-# Not all plugin sets contain examples, so the -Dexamples
-# option needs to be added conditionally.
-GST_PLUGIN_SET_HAS_EXAMPLES ?= "1"
-EXTRA_OEMESON += " \
-    ${@bb.utils.contains('GST_PLUGIN_SET_HAS_EXAMPLES', '1', '-Dexamples=disabled', '', d)} \
-    ${@gettext_oemeson(d)} \
-"
-GIR_MESON_ENABLE_FLAG = "enabled"
-GIR_MESON_DISABLE_FLAG = "disabled"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
index 7c921d97c..269761536 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
@@ -5,7 +5,7 @@
 ########### OE-core copy ##################
 # Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
 SUMMARY = "'Good' GStreamer plugins"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -17,7 +17,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go
 SRC_URI[sha256sum] = "b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778"
-S = "${WORKDIR}/gst-plugins-good-${PV}"
+S = "${UNPACKDIR}/gst-plugins-good-${PV}"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
@@ -98,12 +98,16 @@ LIC_FILES_CHKSUM = " \
    file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \
 "
 # Enable pulsesink in gstreamer
-PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', ' pulseaudio', '', d)}"
+PACKAGECONFIG:append = " pulseaudio"
 # fb implementation of v4l2 uses libdrm
 DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}"
 DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'libdrm', d)}"
+# FIXME: imx93/943 DISTRO_FEATURES contains x11 but v4l2 implement by libdrm ?
+DEPENDS:append:mx93-nxp-bsp = " libdrm"
+DEPENDS:append:mx943-nxp-bsp = " libdrm"
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
                file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
                file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch \
@@ -111,8 +115,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.10.0_2505_L6.12.20"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
-SRCREV = "6a0df1aee0ef2477dbacedd79df08c5bcb648e55"
+SRCREV = "447aebbd3c2b12a72f00316d60d7c86600a330f6"
 S = "${UNPACKDIR}/${BP}"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
index cc2cedfd5..b042adb94 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
@@ -58,7 +58,7 @@ PACKAGECONFIG[v4l2-mxc-source-sink] = "-Dv4l2-mxc-source-sink=true,-Dv4l2-mxc-so
 PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec"
 PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec"
-require gstreamer1.0-plugins-packaging.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
 # the following line is required to produce one package for each plugin
 PACKAGES_DYNAMIC = "^${PN}-.*"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
deleted file mode 100644
index 8b1c00111..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# This .inc file contains functionality for automatically setting
-# the the license of all plugins according to the GSTREAMER_GPL.
-PACKAGESPLITFUNCS += "set_gstreamer_license"
-python set_gstreamer_license () {
-    import oe.utils
-    pn = d.getVar('PN') + '-'
-    gpl_plugins_names = [pn+plugin for plugin in d.getVar('GSTREAMER_GPL').split()]
-    for pkg in oe.utils.packages_filter_out_system(d):
-        if pkg in gpl_plugins_names:
-            d.setVar('LICENSE:' + pkg, 'GPL-2.0-or-later')
-        else:
-            d.setVar('LICENSE:' + pkg, 'LGPL-2.1-or-later')
-}
-EXTRA_OEMESON += " \
-    ${@bb.utils.contains_any('PACKAGECONFIG', "${GSTREAMER_GPL}", '-Dgpl=enabled', '-Dgpl=disabled', d)} \
-    "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
deleted file mode 100644
index d77aeed8a..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-# This .inc file contains functionality for automatically splitting
-# built plugins into individual packages for each plugin. A -meta
-# package is also set up that has no files of its own, but contains
-# the names of all plugin packages in its RDEPENDS list.
-#
-# This is mainly used by the gstreamer1.0-plugins-* plugin set recipes,
-# but can be used in any recipe that produces GStreamer plugins.
-# Dynamically generate packages for all enabled plugins
-PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*"
-PACKAGESPLITFUNCS =+ "split_gstreamer10_packages"
-PACKAGESPLITFUNCS += "set_gstreamer10_metapkg_rdepends"
-python split_gstreamer10_packages () {
-    gst_libdir = d.expand('${libdir}/gstreamer-1.0')
-    postinst = d.getVar('plugin_postinst')
-    glibdir = d.getVar('libdir')
-    # GStreamer libraries
-    do_split_packages(d, glibdir, r'^lib(.*)\.so\.*', 'lib%s', 'GStreamer 1.0 %s library', extra_depends='', allow_links=True)
-    # GStreamer plugin shared objects
-    do_split_packages(d, gst_libdir, r'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer 1.0 plugin for %s', postinst=postinst, extra_depends='')
-    # GObject introspection files for GStreamer plugins
-    do_split_packages(d, glibdir+'/girepository-1.0', r'Gst(.*)-1.0\.typelib$', d.expand('${PN}-%s-typelib'), 'GStreamer 1.0 typelib file for %s', postinst=postinst, extra_depends='')
-    # Static GStreamer libraries for development
-    do_split_packages(d, gst_libdir, r'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer 1.0 plugin for %s (static development files)', extra_depends='${PN}-staticdev')
-}
-python set_gstreamer10_metapkg_rdepends () {
-    import os
-    import oe.utils
-    # Go through all generated packages (excluding the main package and
-    # the -meta package itself) and add them to the -meta package as RDEPENDS.
-    pn = d.getVar('PN')
-    metapkg =  pn + '-meta'
-    d.setVar('ALLOW_EMPTY:' + metapkg, "1")
-    d.setVar('FILES:' + metapkg, "")
-    exclude = [ pn, pn + '-meta' ]
-    metapkg_rdepends = []
-    pkgdest = d.getVar('PKGDEST')
-    for pkg in oe.utils.packages_filter_out_system(d):
-        if pkg not in exclude and pkg not in metapkg_rdepends:
-            # See if the package is empty by looking at the contents of its PKGDEST subdirectory.
-            # If this subdirectory is empty, then the package is.
-            # Empty packages do not get added to the meta package's RDEPENDS
-            pkgdir = os.path.join(pkgdest, pkg)
-            if os.path.exists(pkgdir):
-                dir_contents = os.listdir(pkgdir) or []
-            else:
-                dir_contents = []
-            is_empty = len(dir_contents) == 0
-            if not is_empty:
-                metapkg_rdepends.append(pkg)
-    d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends))
-    d.setVar('DESCRIPTION:' + metapkg, pn + ' meta package')
-}
-# each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
-# so we need them even when empty (like in gst-plugins-good case)
-ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY:${PN}-dev = "1"
-ALLOW_EMPTY:${PN}-staticdev = "1"
-PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
-FILES:${PN} = ""
-FILES:${PN}-apps = "${bindir}"
-FILES:${PN}-glib = "${datadir}/glib-2.0"
-RRECOMMENDS:${PN} += "${PN}-meta"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
index 1f5956ab4..71de57530 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
@@ -1,5 +1,5 @@
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
-require gstreamer1.0-plugins-license.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
 SUMMARY = "'Ugly GStreamer plugins"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -12,11 +12,12 @@ LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LICENSE_FLAGS = "commercial"
 SRC_URI = " \
-            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \
+            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
            "
-SRC_URI[sha256sum] = "a86b51c8454a813120848c803421f327d8c07aabcae461e0597cc49398c0fcde"
-S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "95032eee4580bb9826c008cbce5a2c3a78b980abb270c96a19b645f77255c491"
+S = "${UNPACKDIR}/gst-plugins-ugly-${PV}"
 DEPENDS += "gstreamer1.0-plugins-base"
@@ -39,11 +40,5 @@ EXTRA_OEMESON += " \
    -Dsidplay=disabled \
 "
-# Drop .imx from PV
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
 FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bbappend
index ea144b396..ea144b396 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bbappend
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb
index 388ee81e6..89306c928 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb
@@ -7,8 +7,8 @@ SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db"
+SRC_URI[sha256sum] = "a4b5bfe039b7267fe8cdd48d106ab20cf88cda600f800d84f3d07724079edf1f"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 DEPENDS:append = " gstreamer1.0-plugins-bad"
@@ -17,7 +17,7 @@ RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 PNREAL = "gst-python"
-S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 EXTRA_OEMESON += "\
    -Dtests=disabled \
@@ -25,11 +25,9 @@ EXTRA_OEMESON += "\
    -Dlibpython-dir=${libdir} \
 "
-inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check
+CFLAGS += "-Wno-error=implicit-function-declaration"
-# Drop .imx from PV
+inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 FILES:${PN} += "${libdir}/gstreamer-1.0"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch
new file mode 100644
index 000000000..9a1d206b6
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch
@@ -0,0 +1,63 @@
+From 0c50b2e474a0887aaefb1ae47af2c9b755cd1a12 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Tue, 8 Jul 2025 17:22:38 +0900
+Subject: [PATCH] YOCIMX-9113 rtsp examples: install test-launch and test-uri
+ into rootfs
+gstreamer community has no plan to install these binary as test tool
+https://discourse.gstreamer.org/t/gst-rtsp-server-examples-are-not-installed-by-default/4806
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Haihua Hu <jared.hu@nxp.com>
+---
+ examples/meson.build | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+diff --git a/examples/meson.build b/examples/meson.build
+index 100c3f99f3..5939fb5ff6 100644
+--- a/examples/meson.build
+++ b/examples/meson.build
+@@ -7,7 +7,6 @@ examples = [
+   'test-appsrc2',
+   'test-auth',
+   'test-auth-digest',
+-  'test-launch',
+   'test-mp4',
+   'test-multicast2',
+   'test-multicast',
+@@ -22,11 +21,15 @@ examples = [
+   'test-record',
+   'test-replay-server',
+   'test-sdp',
+-  'test-uri',
+   'test-video',
+   'test-video-rtx',
+ ]
+ 
+install_examples = [
+  'test-launch',
+  'test-uri',
+]
+
+ foreach example : examples
+   executable(example, '@0@.c'.format(example),
+     c_args : rtspserver_args,
+@@ -35,6 +38,14 @@ foreach example : examples
+     install: false)
+ endforeach
+ 
+foreach example : install_examples
+  executable(example, '@0@.c'.format(example),
+    c_args : rtspserver_args,
+    include_directories : rtspserver_incs,
+    dependencies : [gst_dep, gstapp_dep, gstnet_dep, gst_rtsp_server_dep],
+    install: true)
+endforeach
+
+ cgroup_dep = dependency('libcgroup', version : '>= 0.26', required : false)
+ if cgroup_dep.found()
+   executable('test-cgroups', 'test-cgroups.c',
+-- 
+2.34.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb
index b5dd9a322..9c32413ae 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb
@@ -8,31 +8,35 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
 PNREAL = "gst-rtsp-server"
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI[sha256sum] = "e983c039496e3f75e39696554ce74db4120e2465de17aa1cc37160568e9b40bc"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
+           file://0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch \
+          "
-S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "ce4e0b7dde7f17dc4f39ffb2dd3db64b0222d11d58be1c9820c20d30370d6f90"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
 EXTRA_OEMESON += " \
    -Ddoc=disabled \
-    -Dexamples=disabled \
+    -Dexamples=enabled \
    -Dtests=disabled \
 "
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
-# Drop .imx from PV
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 # Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
-require gstreamer1.0-plugins-packaging.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
 CVE_PRODUCT += "gst-rtsp-server"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+########### i.MX overrides ################
+EXTRA_OEMESON:append:mx93-nxp-bsp = " -Dintrospection=disabled "
+EXTRA_OEMESON:append:mx943-nxp-bsp = " -Dintrospection=disabled "
+########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend
deleted file mode 100644
index 3b23818dd..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG_GL:imxgpu = "egl"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb
index 1d83ca031..559bac064 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb
@@ -9,19 +9,15 @@ REALPN = "gstreamer-vaapi"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "573931d455f5a96f63db7c8d35d51322b8d287816e8c6a77d84cfbb9fa1351f1"
+SRC_URI[sha256sum] = "d87c57244cecbd17bb030b698dcb67a66225de639f7c5b837391c4a8e5477667"
-S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/${REALPN}-${PV}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 inherit meson pkgconfig features_check upstream-version-is-even
-# Drop .imx from PV
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 REQUIRED_DISTRO_FEATURES ?= "opengl"
 EXTRA_OEMESON += " \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
index 5b315ed7f..e602ff35c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
@@ -20,8 +20,6 @@ inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection p
 LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
-S = "${WORKDIR}/gstreamer-${PV}"
 SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
           file://run-ptest \
           file://0001-tests-respect-the-idententaion-used-in-meson.patch \
@@ -93,17 +91,15 @@ LIC_FILES_CHKSUM = " \
 # Use i.MX fork of GST for customizations
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
-                  file://0001-tests-respect-the-idententaion-used-in-meson.patch \
+                file://0001-tests-respect-the-idententaion-used-in-meson.patch \
-                  file://0002-tests-add-support-for-install-the-tests.patch \
+                file://0002-tests-add-support-for-install-the-tests.patch \
-                  file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
+                file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
-                  file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
+                file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
 "
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
-SRCREV = "dba94b66ed28cc6537608a68c31c8be52f6f53a5"
+SRCREV = "524a14c8906597f4fd302190adbd3a8af3572866"
-S = "${UNPACKDIR}/${BP}"
 PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch
deleted file mode 100644
index cb314b38d..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b88aec4d7a8c8993c8c75f002a1f2af1635337d1 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Sat, 9 Aug 2025 08:20:50 +0000
-Subject: [PATCH] gplay2: fix termio.h no longer existing
-glibc 2.42 removed the long deprecated termio.h header which
-in 2.41 only included termios.h and sys/ioctl.h. [1]
-Replacing it with sys/ioctl.h seems to provide all the needed
-declaration for successfully compiling.
-[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS#l91
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- tools/gplay2/gplay2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tools/gplay2/gplay2.c b/tools/gplay2/gplay2.c
-index 9e406b9ea8c7..98b3ee5cf666 100755
--- a/tools/gplay2/gplay2.c
-+++ b/tools/gplay2/gplay2.c
-@@ -26,7 +26,7 @@
-  */
- 
- 
-#include <termio.h>
-+#include <sys/ioctl.h>
- #include <unistd.h>
- #include <pthread.h>
- #include <stdio.h>
-- 
-2.42.0
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index 2ba8fdd1d..48d84cead 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -1,8 +1,7 @@
 # Copyright (C) 2014,2016 Freescale Semiconductor
-# Copyright 2017-2021 NXP
+# Copyright 2017-2025 NXP
 # Copyright (C) 2012-2015 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Gstreamer freescale plugins"
 SECTION = "multimedia"
 LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only"
@@ -15,11 +14,13 @@ DEPENDS = " \
    imx-codec \
    imx-parser \
    ${DEPENDS_IMXGPU} \
+    libinput \
 "
 DEPENDS:append:mx6-nxp-bsp = " imx-lib"
 DEPENDS:append:mx7-nxp-bsp = " imx-lib"
 DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
 DEPENDS:append:mx93-nxp-bsp = " imx-lib"
+DEPENDS:append:mx943-nxp-bsp = " imx-lib"
 DEPENDS:append:imxvpu = " imx-vpuwrap"
 DEPENDS:append:imxfbdev:imxgpu = " libdrm"
 DEPENDS_IMXGPU        = ""
@@ -34,14 +35,13 @@ RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
-PV = "4.10.0+git${SRCPV}"
+PV = "4.10.3+git${SRCPV}"
+SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}"
+IMXGST_SRC ?= "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "0565fc515612908a353e8378e24f97de17cc56a6"
-SRC_URI = " \
-    git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
-    file://0001-gplay2-fix-termio.h-no-longer-existing.patch \
-"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "6861aec99901375f5ebcd5170ce1f5232cd38fd6"
 inherit meson pkgconfig use-imx-headers
@@ -60,7 +60,7 @@ EXTRA_OEMESON = "-Dplatform=${PLATFORM} \
                 -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
-PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN}-librecorder-engine ${PN}-libplayengine"
+PACKAGES =+ "${PN}-tools ${PN}-libgstfsl"
 # Add codec list that the beep plugin run-time depended
 BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis"
@@ -86,12 +86,9 @@ FILES:${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}"
 FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
 FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/pkgconfig/*.pc"
-FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+FILES:${PN}-tools += "${bindir}/* ${libdir}/librecorder_engine-1.0${SOLIBS}"
-FILES:${PN}-gplay = "${bindir}/gplay-1.0"
-FILES:${PN}-libgplaycore = "${libdir}/libgplaycore-1.0${SOLIBS}"
 FILES:${PN}-libgstfsl = "${libdir}/libgstfsl-1.0${SOLIBS}"
-FILES:${PN}-grecorder = "${bindir}/grecorder-1.0"
-FILES:${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}"
+INSANE_SKIP:${PN} = "build-deps"
-FILES:${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb
index cf4e4d182..eca003737 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb
@@ -2,13 +2,13 @@
 DESCRIPTION = "NXP Multimedia opencl converter lib"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "virtual/libopencl1"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "b81b785"
+IMX_SRCREV_ABBREV = "84ed303"
-SRC_URI[sha256sum] = "a4dee08d5949d41cb9c61d44ce0b5a055b9416129216f9d36d0bc6d9e512ab64"
+SRC_URI[sha256sum] = "e8813c18e3f65caab2036c1f608b8b7def8314b0f01c830ea696cb1aeb92cc7c"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack autotools pkgconfig meson
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb b/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb
index 60add6e33..d8f002e64 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -14,10 +14,10 @@ RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "e8a7ec7"
+IMX_SRCREV_ABBREV = "65603f3"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "90b4b7f7c3cffc9d57774dbb06e37d810a2618e059f30244e1b4155fb9bc82d5"
+SRC_URI[sha256sum] = "03079bb0fa989dc50fadb66a0fcc7cf65423833c3def04085603d4b66e8f8c70"
 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 1ad735152..dae99cb13 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -5,14 +5,15 @@
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
-SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "${IMX_VPUWRAP_SRC};branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+IMX_VPUWRAP_SRC ?= "git://github.com/NXP/imx-vpuwrap.git;protocol=https"
-SRCREV = "feeb9109a027d3a0f040b0bddb5f79a1daad3587"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "1d2136e39789edb1eff730043caf2305ee2c173e"
 inherit autotools pkgconfig
diff --git a/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
new file mode 100644
index 000000000..6b811b5f1
--- /dev/null
+++ b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
@@ -0,0 +1,115 @@
+# This recipe is for the i.MX fork of libcamera. For ease of
+# maintenance, the top section is a verbatim copy of an OE-core
+# recipe. The second section customizes the recipe for i.MX.
+########### meta-openembedded copy ##################
+# Upstream hash: f4b9dfa0c903bc94c344c657917a3fbb229c322f
+SUMMARY = "Linux libcamera framework"
+SECTION = "libs"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "\
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+"
+SRC_URI = " \
+        git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master;tag=v${PV} \
+"
+SRCREV = "3e6f5d83e397e11cccd3844e121463748f56de39"
+PE = "1"
+DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"
+PACKAGES =+ "${PN}-gst ${PN}-pycamera"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[dng] = ",,tiff"
+PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[pycamera] = "-Dpycamera=enabled,-Dpycamera=disabled,python3 python3-pybind11"
+PACKAGECONFIG[raspberrypi] = ",,libpisp"
+# Raspberry Pi requires the meta-raspberrypi layer
+# These values are coming from the project's meson.build file,
+# which lists the supported values by arch.
+ARM_PIPELINES = "${@bb.utils.contains('PACKAGECONFIG', 'raspberrypi', 'rpi/pisp,rpi/vc4,', '', d)}"
+ARM_PIPELINES .= "imx8-isi,mali-c55,simple,uvcvideo"
+LIBCAMERA_PIPELINES ??= "auto"
+LIBCAMERA_PIPELINES:arm ??= "${ARM_PIPELINES}"
+LIBCAMERA_PIPELINES:aarch64 ??= "${ARM_PIPELINES}"
+EXTRA_OEMESON = " \
+    -Dpipelines=${LIBCAMERA_PIPELINES} \
+    -Dv4l2=true \
+    -Dcam=enabled \
+    -Dlc-compliance=disabled \
+    -Dtest=false \
+    -Ddocumentation=disabled \
+"
+RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}"
+inherit meson pkgconfig python3native
+do_configure:prepend() {
+    sed -i -e 's|py_compile=True,||' ${S}/utils/codegen/ipc/mojo/public/tools/mojom/mojom/generate/template_expander.py
+}
+do_install:append() {
+    chrpath -d ${D}${libdir}/libcamera.so
+    chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so
+}
+do_package:append() {
+    bb.build.exec_func("do_package_recalculate_ipa_signatures", d)
+}
+do_package_recalculate_ipa_signatures() {
+    local modules
+    for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do
+        module="${module%.sign}"
+        if [ -f "${module}" ] ; then
+            modules="${modules} ${module}"
+        fi
+    done
+    ${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}"
+}
+FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so"
+FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
+FILES:${PN}-pycamera = "${PYTHON_SITEPACKAGES_DIR}/libcamera"
+# libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to
+# both 32 and 64 bit file APIs.
+GLIBC_64BIT_TIME_FLAGS = ""
+########### End of meta-openembedded copy ###########
+########### i.MX overrides ################
+SRC_URI:remove = "git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master;tag=v${PV}"
+SRC_URI:prepend = "${LIBCAMERA_SRC};branch=${SRCBRANCH} "
+LIBCAMERA_SRC ?= "git://github.com/nxp-imx/libcamera.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "3e6f5d83e397e11cccd3844e121463748f56de39"
+PACKAGECONFIG = "gst pycamera dng"
+ARM_PIPELINES .= ",nxp/neo"
+EXTRA_OEMESON += " \
+    --python.platlibdir=${PYTHON_SITEPACKAGES_DIR} \
+"
+# Qt installs native tools to /usr/libexec, but this is not in PATH
+PATH:prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'qt', '${STAGING_LIBEXECDIR_NATIVE}:', '', d)}"
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp|mx8mm-nxp-bsp|mx8ulp-nxp-bsp|mx8mq-nxp-bsp)"
+########### End of i.MX overrides #########
diff --git a/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb b/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb
new file mode 100644
index 000000000..88b9a1d0e
--- /dev/null
+++ b/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb
@@ -0,0 +1,35 @@
+SUMMARY = "uGuzzi IPA for the libcamera NXP NEO pipeline"
+DESCRIPTION = "\
+An Image Processing Algorithm library for libcamera, for i.MX95 ISP, \
+based on proprietary MM Solutions EAD uGuzzi 3A library"
+SECTION = "libs"
+LICENSE = "Apache-2.0 & BSD-2-Clause & GPL-2.0-or-later & LGPL-2.1-or-later & MIT & Proprietary"
+# Put EULA on separate line for automated recipe updates
+LIC_FILES_CHKSUM = "file://LICENSES/LA_OPT_NXP_Software_License.txt;md5=bc649096ad3928ec06a8713b8d787eac"
+LIC_FILES_CHKSUM += " \
+    file://COPYING;md5=6462e06298403caf09a22e67a7cc551a \
+    file://LICENSES/Apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=3c328714bf889b2c3c7cd842e3e4893b \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 "
+DEPENDS = "libcamera"
+SRC_URI = "${NEO_IPA_UGUZZI_SRC};branch=${SRCBRANCH}"
+NEO_IPA_UGUZZI_SRC ?= "git://github.com/nxp-imx/neo-ipa-uguzzi;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "3c3b18e397a81fac2babe14dca01f4ada1ecc8b2"
+inherit meson pkgconfig
+FILES:${PN} += "${libdir}/libcamera ${datadir}/libcamera"
+# Libraries are unversioned
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+# Pre-built binaries are already stripped, so skip the QA test
+INSANE_SKIP:${PN} = "already-stripped"
+COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
index 7afa44cb1..f29011601 100644
--- a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
+++ b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
@@ -9,12 +9,13 @@ inherit pkgconfig
 DEPENDS += "alsa-lib nxp-afe"
-PV = "2.0+git"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+PV = "2.0+${SRCPV}"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+NXPAFE_VOICESEEKER_SRC ?= "git://github.com/nxp-imx/imx-voiceui.git;protocol=https"
-SRC_URI = "git://github.com/nxp-imx/imx-voiceui.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "${NXPAFE_VOICESEEKER_SRC};branch=${SRCBRANCH}"
-SRCREV = "737c156469eeede28fe1a0777c968becf6fea886" 
+SRCREV = "94639a8ea4a65a218f60b900269a7dc4bf97fefb"
 EXTRA_CONF = "--enable-armv8 --bindir=/unit_tests/ --libdir=${libdir}"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
index a401bedeb..5ac5d374a 100644
--- a/recipes-multimedia/nxp-afe/nxp-afe_git.bb
+++ b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
@@ -6,20 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7bdef19938f3503cfc4c586461f99012"
 PV = "1.0+git"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
-SRC_URI = " git://github.com/nxp-imx/nxp-afe.git;protocol=https;branch=${SRCBRANCH}"
+NXPAFE_SRC ?= "git://github.com/nxp-imx/nxp-afe.git;protocol=https"
+SRC_URI = " ${NXPAFE_SRC};branch=${SRCBRANCH}"
-SRCREV = "c6b8fee21376e724b8441f3cf6c04dee69b5242e"
+SRCREV = "7d518eb0b18f7c7faadeb3c3397f8b73f0012f3e"
 DEPENDS += "alsa-lib"
 TARGET_CC_ARCH += "${LDFLAGS}"
-do_compile() {
-        oe_runmake clean
-        oe_runmake all
-}
 do_install() {
        install -d ${D}${libdir}/nxp-afe
        install -d ${D}/unit_tests/nxp-afe
@@ -33,3 +29,4 @@ do_install() {
 FILES:${PN} += "/unit_tests"
 INSANE_SKIP:${PN} += "dev-so"
+INSANE_SKIP:${PN}-dbg += "buildpaths"
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 6e4db9110..7f5a7ffbe 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/imx-nxp-bsp:"
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp:"
-SRC_URI += "${SRC_URI_IMX}"
+SRC_URI:append:imx-nxp-bsp = " ${SRC_URI_IMX}"
 SRC_URI_IMX             = ""
 SRC_URI_IMX:mx6-nxp-bsp = " \
    file://0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch \
@@ -16,7 +16,7 @@ SRC_URI_IMX:mx9-nxp-bsp = " \
 CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
-do_install:append() {
+do_install:append:imx-nxp-bsp() {
    if [ -e "${UNPACKDIR}/daemon.conf" ] && [ -e "${UNPACKDIR}/default.pa" ]; then
        install -m 0644 ${UNPACKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
        install -m 0644 ${UNPACKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc
index 1112a864d..06cc89a22 100644
--- a/recipes-security/optee-imx/optee-client-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-client-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See:https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-client-fslc.inc
@@ -10,8 +10,6 @@ SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protoco
 SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${SRCBRANCH} "
 OPTEE_CLIENT_SRC ?= "git://github.com/nxp-imx/imx-optee-client.git;protocol=https"
-SRC_URI += "file://0001-tee-supplicant-Fix-non-arch-service-unit-install-pat.patch"
 inherit pkgconfig
 EXTRA_OECMAKE += "-DCFG_TEE_CLIENT_LOAD_PATH=${nonarch_base_libdir}"
diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
index 70a25fe6c..ab7c8bc69 100644
--- a/recipes-security/optee-imx/optee-client-fslc.inc
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee-client.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 SUMMARY = "OP-TEE Client API"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
diff --git a/recipes-security/optee-imx/optee-client_4.6.0.imx.bb b/recipes-security/optee-imx/optee-client_4.6.0.imx.bb
deleted file mode 100644
index b5a185da1..000000000
--- a/recipes-security/optee-imx/optee-client_4.6.0.imx.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require optee-client-fslc-imx.inc
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
diff --git a/recipes-security/optee-imx/optee-client_4.8.0.imx.bb b/recipes-security/optee-imx/optee-client_4.8.0.imx.bb
new file mode 100644
index 000000000..cb3235a9a
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client_4.8.0.imx.bb
@@ -0,0 +1,4 @@
+require optee-client-fslc-imx.inc
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "ad79099ca6b642f2bb69739f020ea50698ea0744"
diff --git a/recipes-security/optee-imx/optee-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc
index 599dda522..dadbfa802 100644
--- a/recipes-security/optee-imx/optee-fslc.inc
+++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
@@ -19,16 +19,13 @@ OPTEE_ARCH:arm = "arm32"
 OPTEE_ARCH:aarch64 = "arm64"
 OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
-OPTEE_TOOLCHAIN = "${@d.getVar('TOOLCHAIN') or 'gcc'}"
-OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${OPTEE_TOOLCHAIN}", "gcc", d)}"
 # Set here but not passed to EXTRA_OEMAKE by default as that breaks
 # the optee-os build
 TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta"
+# Assume that our TOOLCHAIN matches OP-TEE's COMPILER
 EXTRA_OEMAKE += "V=1 \
-                 LIBGCC_LOCATE_CFLAGS='${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}' \
+                 COMPILER=${TOOLCHAIN} \
-                 COMPILER=${OPTEE_COMPILER} \
                 OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                 TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
                "
diff --git a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
index ffd217099..16ed8cea7 100644
--- a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-os-common-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-os-fslc.inc
 DEPENDS:append:arm = "u-boot-mkimage-native"
@@ -8,7 +8,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
 SRC_URI:remove = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_OS_SRC};branch=${SRCBRANCH} "
-SRC_URI:append = " file://0007-allow-setting-sysroot-for-clang.patch"
 SRC_URI:remove = "file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
                  file://0002-optee-enable-clang-support.patch \
                  file://0003-core-link-add-no-warn-rwx-segments.patch"
diff --git a/recipes-security/optee-imx/optee-os-fslc-imx.inc b/recipes-security/optee-imx/optee-os-fslc-imx.inc
index f46f666ee..ecd88b41d 100644
--- a/recipes-security/optee-imx/optee-os-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-os-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-os-common-fslc-imx.inc
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index 4df1617d1..febdd2c73 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee-os.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 SUMMARY = "OP-TEE Trusted OS"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Trusted side of the TEE"
@@ -15,7 +15,7 @@ CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 DEPENDS = "python3-pyelftools-native python3-cryptography-native"
-DEPENDS:append:toolchain-clang = " compiler-rt"
+DEPENDS:append:toolchain-clang = " lld-native compiler-rt"
 SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
@@ -33,15 +33,14 @@ EXTRA_OEMAKE += " \
 EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}"
 EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}"
+# Enable BTI in optee
+EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}"
 LDFLAGS[unexport] = "1"
 CPPFLAGS[unexport] = "1"
 AS[unexport] = "1"
 LD[unexport] = "1"
-do_compile:prepend() {
-        PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name)
-}
 do_compile() {
    oe_runmake -C ${S} all
 }
diff --git a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
index 0b02c6908..68918414c 100644
--- a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-os-tadevkit-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-os-common-fslc-imx.inc
@@ -22,3 +22,6 @@ do_deploy() {
 }
 FILES:${PN} = "${includedir}/optee/"
+# Build paths are currently embedded
+INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit_4.6.0.imx.bb b/recipes-security/optee-imx/optee-os-tadevkit_4.6.0.imx.bb
deleted file mode 100644
index 92bdf00e7..000000000
--- a/recipes-security/optee-imx/optee-os-tadevkit_4.6.0.imx.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require optee-os-tadevkit-fslc-imx.inc
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit_4.8.0.imx.bb b/recipes-security/optee-imx/optee-os-tadevkit_4.8.0.imx.bb
new file mode 100644
index 000000000..d62d7d647
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os-tadevkit_4.8.0.imx.bb
@@ -0,0 +1,4 @@
+require optee-os-tadevkit-fslc-imx.inc
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "e7ed997213779e3d1b7417461c5b4847d3230db9"
diff --git a/recipes-security/optee-imx/optee-os_4.6.0.imx.bb b/recipes-security/optee-imx/optee-os_4.6.0.imx.bb
deleted file mode 100644
index ed2557bcb..000000000
--- a/recipes-security/optee-imx/optee-os_4.6.0.imx.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2017-2024 NXP
-require optee-os-fslc-imx.inc
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
diff --git a/recipes-security/optee-imx/optee-os_4.8.0.imx.bb b/recipes-security/optee-imx/optee-os_4.8.0.imx.bb
new file mode 100644
index 000000000..b73b4c757
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os_4.8.0.imx.bb
@@ -0,0 +1,6 @@
+# Copyright 2017-2024,2026 NXP
+require optee-os-fslc-imx.inc
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "e7ed997213779e3d1b7417461c5b4847d3230db9"
diff --git a/recipes-security/optee-imx/optee-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc
index b4bb6031b..b7d3a34e6 100644
--- a/recipes-security/optee-imx/optee-test-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc
@@ -1,9 +1,13 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-test-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-test-fslc.inc
 DEPENDS += "openssl"
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "optee"
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
 SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc
index 46d57ac41..a5183b7e1 100644
--- a/recipes-security/optee-imx/optee-test-fslc.inc
+++ b/recipes-security/optee-imx/optee-test-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee-test.inc.
-# See:https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 SUMMARY = "OP-TEE sanity testsuite"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
@@ -12,6 +12,7 @@ inherit deploy
 require optee-fslc.inc
 DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native openssl"
+DEPENDS:append:toolchain-clang = " lld-native"
 SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
           file://run-ptest \
diff --git a/recipes-security/optee-imx/optee-test_4.6.0.imx.bb b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
index 78e933486..2f2b40e09 100644
--- a/recipes-security/optee-imx/optee-test_4.6.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 NXP
+# Copyright 2017-2024,2026 NXP
 require optee-test-fslc-imx.inc
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
                    file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
-SRCBRANCH = "lf-6.12.20_2.0.0"
+SRCBRANCH = "lf-6.18.2_1.0.0"
-SRCREV = "010f088f05b5ebf392c6e235d6e53d391755722f" 
+SRCREV = "3383a744a5997fdb3457b3cbe95aea3ce27879b3"
diff --git a/recipes-security/optee-qoriq/optee-test.nxp.inc b/recipes-security/optee-qoriq/optee-test.nxp.inc
index 6bf158d12..75ed4d0c9 100644
--- a/recipes-security/optee-qoriq/optee-test.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-test.nxp.inc
@@ -10,4 +10,8 @@ SRC_URI:prepend = "${OPTEE_TEST_SRC};branch=${OPTEE_TEST_BRANCH} "
 OPTEE_TEST_SRC ?= "git://github.com/nxp-qoriq/optee_test.git;protocol=https"
+REQUIRED_MACHINE_FEATURES = "optee"
+inherit features_check
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-security/smw/crypto-af-alg_git.bb b/recipes-security/smw/crypto-af-alg_git.bb
new file mode 100644
index 000000000..4101776a5
--- /dev/null
+++ b/recipes-security/smw/crypto-af-alg_git.bb
@@ -0,0 +1,21 @@
+# Copyright 2026 NXP
+SUMMARY = "NXP i.MX CRYPTO AF_ALG"
+DESCRIPTION = "NXP i.MX crypto af alg tool to perform symmetric operation"
+SECTION = "base"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4ef68f113b9400b1140be9b69208a816"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+CRYPTO_AF_ALG_SRC ?= "git://github.com/nxp-imx/crypto_af_alg.git;protocol=https"
+SRC_URI = "${CRYPTO_AF_ALG_SRC};branch=${SRCBRANCH}"
+SRCREV = "2fb11a600af90c80b8bb23368d1d6831c5deb973"
+TARGET_CC_ARCH += "${LDFLAGS}"
+do_install () {
+        oe_runmake DESTDIR=${D} install
+}
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/smw/files/0001-Fixed-discarded-qualifiers-error.patch b/recipes-security/smw/files/0001-Fixed-discarded-qualifiers-error.patch
new file mode 100644
index 000000000..109a739ae
--- /dev/null
+++ b/recipes-security/smw/files/0001-Fixed-discarded-qualifiers-error.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+diff --git a/osal/linux/obj_db.c b/osal/linux/obj_db.c
+index 446a08b1..18e4931b 100644
+--- a/osal/linux/obj_db.c
+++ b/osal/linux/obj_db.c
+@@ -1203,7 +1203,7 @@ static void close_db_file(struct obj_db *db)
+ static int create_directory(const char *filename)
+ {
+        int ret = -1;
+-       char *end = NULL;
+       const char *end = NULL;
+        char *directory = NULL;
+        size_t length = 0;
+        int *err = NULL;
+diff --git a/pkcs11/tests/callback.c b/pkcs11/tests/callback.c
+index 3e0ffbf4..02dc2f91 100644
+--- a/pkcs11/tests/callback.c
+++ b/pkcs11/tests/callback.c
+@@ -245,7 +245,7 @@ void tests_pkcs11_callback(void *lib_hdl, CK_VOID_PTR pfunc)
+ 
+        TEST_START();
+ 
+-       mp_args.testname = strrchr(__func__, '_');
+       mp_args.testname = (char *) strrchr(__func__, '_');
+        if (CHECK_EXPECTED(mp_args.testname, "Unable to get function name\n") ||
+            !mp_args.testname)
+                goto end;
diff --git a/recipes-security/smw/itest_git.bb b/recipes-security/smw/itest_git.bb
new file mode 100644
index 000000000..7885edc30
--- /dev/null
+++ b/recipes-security/smw/itest_git.bb
@@ -0,0 +1,34 @@
+# Copyright 2026 NXP
+SUMMARY = "NXP i.MX Itest"
+DESCRIPTION = "NXP i.MX Itest"
+SECTION = "base"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
+SRC_URI = "${ITEST_SRC};branch=${SRCBRANCH}"
+ITEST_SRC ?= "git://github.com/nxp-imx/itest.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "37533de97b8f5f430caa00e3560fdbd4483d893c"
+inherit cmake
+PACKAGECONFIG:mx8dxl-nxp-bsp ??= "ele-seco"
+PACKAGECONFIG:mx8ulp-nxp-bsp ??= "ele"
+PACKAGECONFIG:mx91-nxp-bsp   ??= "ele"
+PACKAGECONFIG:mx93-nxp-bsp   ??= "ele"
+PACKAGECONFIG:mx943-nxp-bsp  ??= "ele ele-seco prime"
+PACKAGECONFIG:mx95-nxp-bsp   ??= "ele ele-seco"
+PACKAGECONFIG:mx952-nxp-bsp  ??= "ele ele-seco prime"
+PACKAGECONFIG[ele]      = "-DELE=1,,imx-secure-enclave"
+PACKAGECONFIG[ele-seco] = "-DV2X=1,,imx-secure-enclave-seco"
+PACKAGECONFIG[prime]    = "-DPRIME=1,,imx-secure-enclave-prime"
+EXTRA_OECMAKE = " \
+    -DOPENSSL_PATH="${STAGING_DIR_HOST}/usr" \
+    -DELE_LIB_PATH="${STAGING_DIR_HOST}/usr" \
+    -DLIB_PATH="${STAGING_DIR_HOST}${libdir}""
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(mx8dxl-nxp-bsp|mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb
index f147e1148..13202326b 100644
--- a/recipes-security/smw/keyctl-caam_git.bb
+++ b/recipes-security/smw/keyctl-caam_git.bb
@@ -4,15 +4,19 @@ SUMMARY = "NXP i.MX CAAM Keyctl"
 DESCRIPTION = "NXP i.MX keyctl tool to manage CAAM Keys"
 SECTION = "base"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8636bd68fc00cc6a3809b7b58b45f982"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
-SRCBRANCH = "master"
+SRCBRANCH = "lf-6.18.2_1.0.0"
 SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "81dc06cdb9c4d0d4ba10459d85af9a8603774948"
+SRCREV = "71cb18f17d766145217a5517748e37e250b055bf"
+DEPENDS = " openssl"
 TARGET_CC_ARCH += "${LDFLAGS}"
+EXTRA_OEMAKE = " OPENSSL_PATH=${STAGING_INCDIR}"
 do_install () {
        oe_runmake DESTDIR=${D} install
 }
diff --git a/recipes-security/smw/smw_5.3.bb b/recipes-security/smw/smw_5.3.bb
new file mode 100644
index 000000000..46155978e
--- /dev/null
+++ b/recipes-security/smw/smw_5.3.bb
@@ -0,0 +1,88 @@
+# Copyright 2020-2026 NXP
+require recipes-security/optee-imx/optee-fslc.inc
+SUMMARY = "NXP i.MX Security Middleware Library"
+DESCRIPTION = "NXP i.MX Security Middleware Library"
+SECTION = "base"
+LICENSE = "BSD-3-Clause"
+LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ff20c8e51b28869d9cdec70a818d163f \
+                    file://${PSA_ARCH_TESTS_SRC_PATH}/LICENSE.md;md5=2a944942e1496af1886903d274dedb13"
+DEPENDS = " \
+    python3-cryptography-native \
+    json-c \
+    optee-client \
+    optee-os-tadevkit \
+    sqlite3 \
+"
+SRC_URI = "${SMW_LIB_SRC};branch=${SRCBRANCH_smw};name=smw \
+           ${PSA_LIB_SRC};branch=${SRCBRANCH_psa};name=psa;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/${PSA_ARCH_TESTS_SRC_PATH}"
+SRC_URI += "file://0001-Fixed-discarded-qualifiers-error.patch"
+SMW_LIB_SRC ?= "git://github.com/nxp-imx/imx-smw.git;protocol=https"
+PSA_LIB_SRC ?= "git://github.com/ARM-software/psa-arch-tests.git;protocol=https"
+PSA_ARCH_TESTS_SRC_PATH = "../psa-arch-tests"
+SRCBRANCH_smw = "release/version_5.x"
+SRCBRANCH_psa = "main"
+SRCREV_smw = "c643587073584057700f39098ab12f536a21600d"
+SRCREV_psa = "463cb95ada820bc6f758d50066cf8c0ed5cc3a02"
+SRCREV_FORMAT = "smw_psa"
+inherit cmake features_check python3native
+REQUIRED_MACHINE_FEATURES = "optee"
+PACKAGECONFIG ??= "${PACKAGECONFIG_DRIVERS} ${PACKAGECONFIG_FEATURES}"
+PACKAGECONFIG_DRIVERS                = ""
+PACKAGECONFIG_DRIVERS:mx8x-nxp-bsp   = "ele-seco"
+PACKAGECONFIG_DRIVERS:mx8ulp-nxp-bsp = "ele"
+PACKAGECONFIG_DRIVERS:mx91-nxp-bsp   = "ele"
+PACKAGECONFIG_DRIVERS:mx93-nxp-bsp   = "ele"
+PACKAGECONFIG_DRIVERS:mx943-nxp-bsp  = "ele"
+PACKAGECONFIG_DRIVERS:mx95-nxp-bsp   = "ele"
+PACKAGECONFIG_FEATURES              = ""
+PACKAGECONFIG_FEATURES:mx91-nxp-bsp = "tls"
+PACKAGECONFIG_FEATURES:mx93-nxp-bsp = "tls"
+PACKAGECONFIG_FEATURES:mx943-nxp-bsp = "tls"
+PACKAGECONFIG_FEATURES:mx95-nxp-bsp = "tls"
+PACKAGECONFIG[ele] = "-DELE_ROOT=${STAGING_DIR_HOST},,imx-secure-enclave,,,ele-seco"
+PACKAGECONFIG[ele-seco] = "-DSECO_ROOT=${STAGING_DIR_HOST},,imx-secure-enclave-seco,,,ele"
+PACKAGECONFIG[tls] = "-DENABLE_TLS=ON,-DENABLE_TLS=OFF,openssl"
+CFLAGS[unexport] = "1"
+CPPFLAGS[unexport] = "1"
+AS[unexport] = "1"
+LD[unexport] = "1"
+# setting the linker options
+TARGET_LDFLAGS:remove = "${DEBUG_PREFIX_MAP}"
+EXTRA_OECMAKE = " \
+    -DYOCTO_BUILD=ON \
+    -DTA_DEV_KIT_ROOT=${TA_DEV_KIT_DIR} \
+    -DTEEC_ROOT=${STAGING_DIR_HOST} \
+    -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr" \
+    -DPSA_ARCH_TESTS_SRC_PATH=${PSA_ARCH_TESTS_SRC_PATH} \
+    -DTEE_TA_DESTDIR=${nonarch_base_libdir} \
+"
+OECMAKE_TARGET_COMPILE += "build_tests"
+OECMAKE_TARGET_INSTALL += "install_tests"
+PACKAGES =+ "${PN}-tests"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/*"
+INSANE_SKIP:${PN}-dbg = "buildpaths"
+FILES:${PN}-tests = "${bindir}/* ${datadir}/${BPN}/*"
+RDEPENDS:${PN}-tests = "cmake"
+INSANE_SKIP:${PN}-tests = "buildpaths"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/smw/smw_git.bb b/recipes-security/smw/smw_git.bb
deleted file mode 100644
index dbb59d2f3..000000000
--- a/recipes-security/smw/smw_git.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2020-23 NXP
-SUMMARY = "NXP i.MX Security Middleware Library"
-DESCRIPTION = "NXP i.MX Security Middleware Library"
-SECTION = "base"
-LICENSE = "BSD-3-Clause"
-LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982 \
-                    file://../psa-arch-tests/LICENSE.md;md5=2a944942e1496af1886903d274dedb13"
-DEPENDS = "json-c optee-os optee-client python3-cryptography-native"
-DEPENDS:append:mx8qxp-nxp-bsp = " imx-seco-libs"
-DEPENDS:append:mx8dx-nxp-bsp  = " imx-seco-libs"
-DEPENDS:append:mx8ulp-nxp-bsp  = " imx-secure-enclave"
-SRC_URI = "git://github.com/nxp-imx/imx-smw.git;protocol=https;branch=release/version_2.x;name=smw;destsuffix=git/smw \
-           git://github.com/ARM-software/psa-arch-tests.git;protocol=https;branch=main;name=psa;destsuffix=git/psa-arch-tests \
-           "
-SRCREV_smw = "f0570b3e8cb5f68d54edc4f9dd7cb984f6f604ed"
-SRCREV_psa = "463cb95ada820bc6f758d50066cf8c0ed5cc3a02"
-SRCREV_FORMAT = "smw_psa"
-S = "${UNPACKDIR}/git/smw"
-inherit cmake python3native
-CFLAGS[unexport] = "1"
-CPPFLAGS[unexport] = "1"
-AS[unexport] = "1"
-LD[unexport] = "1"
-# setting the linker options
-TARGET_LDFLAGS:remove = "${DEBUG_PREFIX_MAP}"
-OPTEE_OS_TA_EXPORT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64"
-OPTEE_OS_TA_EXPORT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32"
-# Needs to sign OPTEE TAs
-export OPENSSL_MODULES = "${STAGING_LIBDIR_NATIVE}/ossl-modules"
-EXTRA_OECMAKE = " \
-    -DTA_DEV_KIT_ROOT=${OPTEE_OS_TA_EXPORT_DIR} \
-    -DTEEC_ROOT=${STAGING_DIR_HOST} \
-    -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr" \
-    -DPSA_ARCH_TESTS_SRC_PATH=../${PSA_ARCH_TESTS_SRC_PATH} \
-"
-EXTRA_OECMAKE:append:mx8qxp-nxp-bsp = "-DSECO_ROOT=${STAGING_DIR_HOST}"
-EXTRA_OECMAKE:append:mx8dx-nxp-bsp = "-DSECO_ROOT=${STAGING_DIR_HOST}"
-EXTRA_OECMAKE:append:mx8ulp-nxp-bsp = "-DELE_ROOT=${STAGING_DIR_HOST}"
-EXTRA_OECMAKE_IMX:mx93-nxp-bsp = "-DELE_ROOT=${STAGING_DIR_HOST}"
-OECMAKE_TARGET_COMPILE += "build_tests"
-OECMAKE_TARGET_INSTALL += "install_tests"
-INSANE_SKIP_${PN}-tests = "textrel"
-PACKAGES =+ "${PN}-tests"
-FILES:${PN} += "${base_libdir}/optee_armtz/*"
-FILES:${PN}-tests = "${bindir}/* ${datadir}/${BPN}/*"
-RDEPENDS:${PN}-tests += "bash cmake"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"