254 files changed, 2135 insertions, 1326 deletions
diff --git a/EULA b/EULA
index 5f5cc2f96..5a03801a9 100644
--- a/EULA
+++ b/EULA
@@ -1,4 +1,4 @@
-LA_OPT_NXP_Software_License v58 November 2024
+LA_OPT_NXP_Software_License v62 May 2025
 IMPORTANT.  Read the following NXP Software License Agreement ("Agreement")
 completely. By selecting the "I Accept" button at the end of this page, or by
 downloading, installing, or using the Licensed Software, you indicate that you
@@ -157,6 +157,8 @@ of the Licensed Software to anyone other than NXP.  You may advise NXP of any
 results obtained from your use of the Licensed Software, including any problems
 or suggested improvements thereof, and NXP retains the right to use such
 results and related information in any manner it deems appropriate.
+3.9.        Licensee may not use the Licensed Software as data or training
+input to any artificial intelligence models or machine learning algorithms.
 4.       OPEN SOURCE.         Open source software included in the Licensed
 Software is not licensed under the terms of this Agreement but is instead
 licensed under the terms of the applicable open source license(s), such as the
@@ -222,9 +224,10 @@ to you.
 disclaims any warranty for the Licensed Software. The Licensed Software is
 provided "AS IS", without warranty of any kind, either express or implied,
 including without limitation the implied warranties of merchantability, fitness
-for a particular purpose, or non-infringement. You assume the entire risk
+for a particular purpose,  non-infringement, or any warranty that the Licensed
-arising out of the use or performance of the licensed software, or any systems
+Software is free from vulnerabilities. You assume the entire risk arising out
-you design using the licensed software (if any).
+of the use or performance of the licensed software, or any systems you design
+using the licensed software (if any).
 10.        INDEMNITY. You agree to fully defend and indemnify NXP from all
 claims, liabilities, and costs (including reasonable attorney’s fees) related
 to (1) your use (including your subcontractor’s or distributee’s use, if
@@ -242,6 +245,7 @@ COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF OR IN CONNECTION
 WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS AGREEMENT IS LIMITED TO
 THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION WITH THE LICENSED
 SOFTWARE PROVIDED UNDER THIS AGREEMENT TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
 12.        EXPORT COMPLIANCE.
 12.1    Each party shall comply with all applicable export and import control
 laws and regulations including but not limited to the US Export Administration
@@ -259,7 +263,7 @@ without obtaining prior written authorization from the applicable competent
 government authorities to the extent required by those laws.
 12.2    Prohibition of Export to Russian Federation
-(a)     With respect to activitit that falls under the scope of Article 12g,
+(a)     With respect to activity that falls under the scope of Article 12g,
 12ga of Council Regulation (EU) No 833/2014, or Council Regulation (EU) No
 765/2006 (as the case requires), you (a) will not sell, export or re-export,
 directly or indirectly any item, and (b) will not sell, license or sublicense
@@ -572,7 +576,7 @@ provide Fraunhofer your name and contact information.
 Future Technology Devices International Ltd.: Future Technology Devices
 International software must be used consistent with the terms found here:
-http://www.ftdichip.com/Drivers/FTDriverLicenceTerms.htm
+https://ftdichip.com/driver-licence-terms-details/
 Global Locate (Broadcom Corporation): Use of Global Locate, Inc. software is
 limited to evaluation and demonstration only.  Permitted distributions must be
@@ -633,10 +637,17 @@ Licensed Software includes proprietary software of MindTree in source code
 format, Licensee may make modifications and create derivative works only to the
 extent necessary for debugging of the Licensed Software.
-MM SOLUTIONS AD:  Use of MM SOLUTIONS AEC (Auto Exposure Control) and AWB (Auto
+MM SOLUTIONS EAD:  Use of the following MM SOLUTIONS software is limited to use
-White Balance) software is limited to demonstration, testing, and evaluation
+in conjuncture with NXP Products that have the Imaging Subsystem Processor
-only.  In no event may Licensee distribute or sublicense the MM SOLUTIONS
+(ISP) enabled (fusing configuration), as indicated in the applicable data
-software. Further rights must be obtained directly from MM SOLUTIONS.
+sheet: (i) MMS Tuning Tool; (ii) Camera Development Kit (uGuzzi); (iii) and
+additional Camera Software. For the purposes of this Agreement, “Camera
+Software” means: (a) AEC (Auto Exposure Control); (b) AWB (Auto White
+Balance), (c) Auto Focus; (d) Wide Dynamic Range; (e) LED Flicker Mitigation;
+and (f) Multi-Camera Harmonization.  In no event may Licensee distribute or
+sublicense the MM SOLUTIONS software, unless otherwise licensed to do so by
+issuance of the distribution rights under Section 2.3 of the Agreement. Any
+further rights must be obtained directly from MM SOLUTIONS directly.
 MPEG LA: Use of MPEG LA audio or video codec technology is limited to
 evaluation and demonstration only. Permitted distributions must be similarly
@@ -647,10 +658,19 @@ Licensee under any circumstance, even by a signed written amendment to this
 Agreement.
 NXP Voice Software: VoiceSpot, VoiceSeeker (including AEC), VIT Speech to
-Intent, and Conversa may be used for evaluation or demonstration purposes only.
+Intent, and Conversa are subject to the terms of Section 2.2 only. Any
-Any commercial distribution rights are subject to a separate royalty agreement
+commercial distribution rights are subject to a separate royalty agreement
 obtained from NXP.
+Together with the voice communication algorithm Conversa Licensee may get a
+tuning tool from DevExpress and/or Lightning Chart in form of certain libraries
+noted as ([name].dll) (“Tool”). Conversa as well as the Tool may only be
+used by Licensee internally during testing, evaluation or product development
+solely for tuning purposes of Licensee’s products in connection with
+Conversa. Any use of Conversa or the Tool outside the scope of this license is
+strictly prohibited, distributing the Libraries in any form. Licensee may use
+Conversa in connection with its products only following the execution of a
+separate royalty agreement with NXP.
 NXP Wireless Charging Library: License to the Software is limited to use in
 inductive coupling or wireless charging applications
diff --git a/LICENSE b/LICENSE
index b69284ffb..1ecb45ae0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,20 +2,20 @@
 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 = "GPL-2.0-only"
+./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_1.0.0.bb: LICENSE = "BSD-3-Clause"
 ./dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb: LICENSE = "MIT"
-./recipes-bsp/atf/qoriq-atf-2.6.inc: LICENSE = "BSD-3-Clause"
+./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.1.bb: LICENSE = "Proprietary"
+./recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb: LICENSE = "Proprietary"
-./recipes-bsp/firmware-imx/firmware-imx-8.27.inc: LICENSE = "Proprietary"
+./recipes-bsp/firmware-imx/firmware-imx-8.28.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"
 ./recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb: LICENSE = "GPL-2.0-only"
-./recipes-bsp/imx-atf/imx-atf_2.10.bb: LICENSE = "BSD-3-Clause"
+./recipes-bsp/imx-atf/imx-atf_2.12.bb: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/imx-kobs/imx-kobs_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-bsp/imx-lib/imx-lib_git.bb: LICENSE = "LGPL-2.1-only"
 ./recipes-bsp/imx-mkimage/imx-boot_1.0.bb: LICENSE = "GPL-2.0-only"
@@ -32,8 +32,8 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.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.1.bb: LICENSE = "Proprietary"
+./recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb: LICENSE = "Proprietary"
-./recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb: LICENSE = "Proprietary"
+./recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb: LICENSE = "Proprietary"
 ./recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.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"
@@ -43,7 +43,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/rcw/rcw_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc: LICENSE = "GPL-2.0-or-later"
 ./recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc: LICENSE = "GPL-2.0-or-later"
-./recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb: LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only"
+./recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb: LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only"
 ./recipes-bsp/uefi/uefi_git.bb: LICENSE = "NXP-Binary-EULA"
 ./recipes-core/udev/udev-rules-imx.bb: LICENSE = "MIT"
 ./recipes-core/udev/udev-rules-qoriq.bb: LICENSE = "MIT"
@@ -52,13 +52,15 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-devtools/qemu/qemu.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/uuu/uuu-bin_1.5.165.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
+./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"
 ./recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb: LICENSE = "Apache-2.0 & MIT"
 ./recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb: LICENSE = "Apache-2.0"
 ./recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb: LICENSE = "Apache-2.0"
+./recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb: LICENSE = "Apache-2.0"
 ./recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb: LICENSE = "Apache-2.0 & MIT"
 ./recipes-dpaa/eth-config/eth-config_git.bb: LICENSE = "BSD-3-Clause & GPL-2.0-or-later"
 ./recipes-dpaa/flib/flib_git.bb: LICENSE = "BSD-3-Clause & GPL-2.0-only"
@@ -88,24 +90,25 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-fsl/mcore-demos/imx-mcore-demos.inc: LICENSE = "Proprietary"
 ./recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb: LICENSE = "MIT"
 ./recipes-graphics/drm/libdrm_2.4.123.imx.bb: LICENSE = "MIT"
-./recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb: LICENSE = "Proprietary"
+./recipes-graphics/imx-g2d/imx-dpu-g2d_2.4.0.0.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.0.bb: LICENSE = "Proprietary"
+./recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.2.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-viv/imx-gpu-viv-6.inc: LICENSE = "Proprietary"
-./recipes-graphics/mali/mali-imx_r53.0.bb: 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/wayland/wayland-protocols_1.37.imx.bb: LICENSE = "MIT"
+./recipes-graphics/vulkan/vulkan-wsi-layer_git.bb: LICENSE = "MIT"
+./recipes-graphics/wayland/wayland-protocols_1.41.imx.bb: LICENSE = "MIT"
 ./recipes-graphics/wayland/weston_10.0.5.imx.bb: LICENSE = "MIT"
-./recipes-graphics/wayland/weston_14.0.1.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.p3.0.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.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.1.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.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"
@@ -128,38 +131,37 @@ LICENSE:libpostproc = "GPL-2.0-or-later"
 LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
 LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
 LICENSE_FLAGS = "commercial"
-./recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.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/gstreamer1.0-libav_1.24.7.imx.bb: LICENSE_FLAGS = "commercial"
+./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb: LICENSE_FLAGS = "commercial"
 LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-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-base_1.24.7.imx.bb: LICENSE = "LGPL-2.1-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-good_1.24.7.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-imx_2.2.0.bb: LICENSE = "LGPL-2.0-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-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"
 LICENSE_FLAGS = "commercial"
-./recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
+./recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
-./recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.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-vaapi_1.24.0.imx.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_1.24.7.imx.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/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.9.3.bb: LICENSE = "Proprietary"
+./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.1.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.7.0.bb: LICENSE = "Proprietary"
+./recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb: LICENSE = "Proprietary"
-./recipes-multimedia/imx-parser/imx-parser_4.9.3.bb: LICENSE = "Proprietary"
+./recipes-multimedia/imx-parser/imx-parser_4.10.0.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/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"
+./recipes-multimedia/nxp-afe/nxp-afe_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-multimedia/tinycompress/tinycompress_1.2.5.bb: LICENSE = "LGPL-2.1-only | BSD-3-Clause"
 ./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/optee-qoriq/optee-client.nxp.inc: LICENSE = "BSD"
-./recipes-security/optee-qoriq/optee-os.nxp.inc: LICENSE = "BSD"
-./recipes-security/optee-qoriq/optee-test.nxp.inc: LICENSE = "BSD & GPL-2.0-only"
 ./recipes-security/smw/keyctl-caam_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-security/smw/smw_git.bb: LICENSE = "BSD-3-Clause"
 LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib"
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 5b165e481..f8861cd14 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -62,6 +62,8 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53 = "44a8052c384584ba09077e85
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56 = "10c0fda810c63b052409b15a5445671a"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57 = "ca53281cc0caa7e320d4945a896fb837"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58 = "c0fb372b5d7f12181de23ef480f225f3"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8cbc32a25a"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62 = "a93b654673e1bc8398ed1f30e0813359"
 FSL_EULA_FILE_MD5SUMS = " \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
@@ -120,11 +122,13 @@ FSL_EULA_FILE_MD5SUMS = " \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58} \
+    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60} \
+    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62} \
 "
 # The checksum for the EULA in the layer
 FSL_EULA_FILE_MD5SUM ?= \
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58}"
+    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62}"
 LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
 LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
@@ -166,7 +170,7 @@ python fsl_bin_do_unpack() {
    localdata = bb.data.createCopy(d)
-    rootdir = localdata.getVar('WORKDIR', True)
+    rootdir = localdata.getVar('UNPACKDIR', True)
    fetcher = bb.fetch2.Fetch(src_uri, localdata)
    found = 0
diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass
index 9ef0a62f6..fae3fe1d9 100644
--- a/classes/fsl-kernel-localversion.bbclass
+++ b/classes/fsl-kernel-localversion.bbclass
@@ -13,7 +13,8 @@ SCMVERSION ??= "y"
 LOCALVERSION ??= "+fslc"
 # LINUX_VERSION_EXTENSION is used as CONFIG_LOCALVERSION by kernel-yocto class
-LINUX_VERSION_EXTENSION ?= "${LOCALVERSION}"
+LINUX_VERSION_EXTENSION ?= \
+    "${@bb.utils.contains('SCMVERSION', 'y', '', '${LOCALVERSION}', d)}"
 do_kernel_localversion[dirs] += "${S} ${B}"
 do_kernel_localversion() {
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index b0d3dc1fb..7c9f34927 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -52,17 +52,21 @@ do_resolve_and_populate_binaries() {
        for config in ${UBOOT_MACHINE}; do
            i=$(expr $i + 1);
            for type in ${UBOOT_CONFIG}; do
+                builddir="${config}-${type}"
                j=$(expr $j + 1);
                if [ $j -eq $i ]; then
                    for firmware in ${IMX_BOOT_CONTAINER_FIRMWARE}; do
-                        bbnote "Copy firmware: ${firmware} from ${DEPLOY_DIR_IMAGE} -> ${B}/${config}/"
+                        bbnote "Copy firmware: ${firmware} from ${DEPLOY_DIR_IMAGE} -> ${B}/${builddir}/"
-                        cp ${DEPLOY_DIR_IMAGE}/${firmware} ${B}/${config}/
+                        cp ${DEPLOY_DIR_IMAGE}/${firmware} ${B}/${builddir}/
                    done
                    if [ -n "${ATF_MACHINE_NAME}" ]; then
-                        cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${B}/${config}/bl31.bin
+                        cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${B}/${builddir}/bl31.bin
                    else
                        bberror "ATF binary is undefined, result binary would be unusable!"
                    fi
+                    if [ "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '1' , '0' , d)}" = "1" ] ; then
+                        cp ${DEPLOY_DIR_IMAGE}/${OPTEE_BOOT_IMAGE} ${B}/${builddir}/
+                    fi
                fi
            done
            unset  j
@@ -87,10 +91,11 @@ do_deploy:append() {
        for config in ${UBOOT_MACHINE}; do
            i=$(expr $i + 1);
            for type in ${UBOOT_CONFIG}; do
+                builddir="${config}-${type}"
                j=$(expr $j + 1);
                if [ $j -eq $i ]
                then
-                    install -m 0644 ${B}/${config}/flash.bin  ${DEPLOYDIR}/flash.bin-${MACHINE}-${type}
+                    install -m 0644 ${B}/${builddir}/flash.bin  ${DEPLOYDIR}/flash.bin-${MACHINE}-${type}
                    # When there's more than one word in UBOOT_CONFIG,
                    # the first UBOOT_CONFIG listed will be the imx-boot binary
                    if [ ! -f "${DEPLOYDIR}/imx-boot" ]; then
diff --git a/conf/layer.conf b/conf/layer.conf
index d35660501..4b0a5f77f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "freescale-layer"
 BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_freescale-layer = "5"
-LAYERSERIES_COMPAT_freescale-layer = "walnascar"
+LAYERSERIES_COMPAT_freescale-layer = "whinlatter"
 LAYERDEPENDS_freescale-layer = "core"
 # Add the Freescale-specific licenses into the metadata
diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index 7d87010b4..f0488912f 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -58,8 +58,6 @@ IMX_BOOT_SOC_TARGET = "iMX8MN"
 SERIAL_CONSOLES = "115200;ttymxc1"
-IMAGE_BOOTLOADER = "imx-boot"
 BOOT_SPACE = "65536"
 LOADADDR = ""
 UBOOT_MAKE_TARGET = "all"
diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf
index 38acc47da..5ae9ac665 100644
--- a/conf/machine/imx95-19x19-verdin.conf
+++ b/conf/machine/imx95-19x19-verdin.conf
@@ -8,6 +8,12 @@ MACHINEOVERRIDES =. "mx95:"
 require conf/machine/include/imx95-evk.inc
+# iMX95 Verdin EVK V1.1E is the first revision with a B0 SoC,
+# older versions require A0/A1 support, set with the below variable
+#IMX_SOC_REV:${MACHINE} = "A0"
+# When building for A0/A1 iMX95 SoCs, set OEI_DDRCONFIG accordingly
+OEI_DDRCONFIG = "${@'XIMX95LPD5EVK19_6400mbps_train_timing_a1' if d.getVar('IMX_SOC_REV')[0] == 'A' else ''}"
 KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 15d7b2e8d..4e0b2f927 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -185,6 +185,7 @@ IMX_SOC_REV:mx8ulp-generic-bsp ??= \
    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \
                                                           'A2', d)}"
 IMX_SOC_REV:mx93-generic-bsp   ??= "A1"
+IMX_SOC_REV:mx95-generic-bsp   ??= "B0"
 IMX_SOC_REV_LOWER   = "${@d.getVar('IMX_SOC_REV').lower()}"
 IMX_SOC_REV_UPPER   = "${@d.getVar('IMX_SOC_REV').upper()}"
@@ -361,7 +362,7 @@ MACHINE_SOCARCH_FILTER:append:imxgpu = " \
    virtual/egl \
    virtual/libopenvg \
    virtual/mesa \
-    virtual/opencl-icd \
+    virtual/libopencl1 \
    libdrm \
    cairo \
    libgal-imx \
@@ -527,30 +528,20 @@ 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:mx8-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp              ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp  ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp              ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx"
 # GStreamer copied recipes
-PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp              ??= "1.24.0.imx"
+PREFERRED_VERSION_gst-devtools:imx-nxp-bsp              ??= "1.26.0.imx"
-PREFERRED_VERSION_gst-examples:mx8-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gst-examples:imx-nxp-bsp              ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp        ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp       ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp       ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp  ??= "1.26.0.imx"
-PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp        ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp        ??= "1.26.0.imx"
-PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp              ??= "1.24.0.imx"
-PREFERRED_VERSION_gst-examples:mx9-nxp-bsp              ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp        ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp       ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp  ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp        ??= "1.24.0.imx"
 # GStreamer downgrade ffmpeg
 PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
@@ -580,39 +571,44 @@ PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d   ?= "${IMXGPU_GRAPHICS_PROVIDER}"
 PREFERRED_PROVIDER_opencl-clhpp:imxviv         ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-headers:imxviv       ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-icd-loader:imxviv    ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/opencl-icd:imxviv   ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libopencl1:imxviv   ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libg2d              ?= "imx-gpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:imxdpu       ?= "imx-dpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
-PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "14.0.1.imx"
+# Set preferred Vulkan ICD runtime
+PREFERRED_RPROVIDER_virtual-vulkan-icd         ?= "mesa"
+PREFERRED_RPROVIDER_virtual-vulkan-icd:imxviv  ?= "libvulkan-imx"
+PREFERRED_RPROVIDER_virtual-vulkan-icd:imxmali ?= "mali-imx-libvulkan"
+PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "14.0.2.imx"
 # i.MX 6 & 7 stay on weston 10.0 for fbdev
 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_wayland-protocols:imx-nxp-bsp  ??= "1.37.imx"
+PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp  ??= "1.41.imx"
 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_glslang:imxvulkan                  ??= "1.3.275.0.imx"
 PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.275.0.imx"
 PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.275.0.imx"
 PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.275.0.imx"
 PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.275.0.imx"
 PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-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:mx8-nxp-bsp     ??= "4.4.0.imx"
+PREFERRED_VERSION_optee-os:imx-nxp-bsp     ??= "4.6.0.imx"
-PREFERRED_VERSION_optee-os:mx9-nxp-bsp     ??= "4.4.0.imx"
+PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.6.0.imx"
-PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx"
+PREFERRED_VERSION_optee-test:imx-nxp-bsp   ??= "4.6.0.imx"
-PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx"
+PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp   ??= "4.6.0.imx"
-PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "4.4.0.imx"
-PREFERRED_VERSION_optee-test:mx9-nxp-bsp   ??= "4.4.0.imx"
 # Use i.MX opencv Version
 PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf
index 7de1e990a..2bc827153 100644
--- a/conf/machine/ls1012afrwy.conf
+++ b/conf/machine/ls1012afrwy.conf
@@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf
index 879e3f8fb..a170b0529 100644
--- a/conf/machine/ls1012ardb.conf
+++ b/conf/machine/ls1012ardb.conf
@@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf
index 268a60c3e..68249a402 100644
--- a/conf/machine/ls1028ardb.conf
+++ b/conf/machine/ls1028ardb.conf
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index 4ff3c0acb..8723a7ddd 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf
index eb3c0bb6f..4de0d9def 100644
--- a/conf/machine/ls1046afrwy.conf
+++ b/conf/machine/ls1046afrwy.conf
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index 2b82c98f0..b2d9fa1ca 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf
index f9d05b690..ba66ab355 100644
--- a/conf/machine/ls1088ardb-pb.conf
+++ b/conf/machine/ls1088ardb-pb.conf
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index 1b7a4f3cb..13a1f6240 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index 8c8e586a4..617591e4b 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:"
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf
index 1945ad310..c8fbcc1cd 100644
--- a/conf/machine/lx2160ardb.conf
+++ b/conf/machine/lx2160ardb.conf
@@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:"
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 DTB_LOAD = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/conf/machine/lx2162aqds.conf b/conf/machine/lx2162aqds.conf
index 80f91331b..1842daff6 100644
--- a/conf/machine/lx2162aqds.conf
+++ b/conf/machine/lx2162aqds.conf
@@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2162a:"
 MACHINE_FEATURES += "optee"
-KERNEL_CLASSES  = " kernel-fitimage "
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
-KERNEL_IMAGETYPES = "fitImage"
 DTB_LOAD = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
new file mode 100644
index 000000000..0fce6af1a
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
@@ -0,0 +1,54 @@
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "gcc-arm-none-eabi-native"
+inherit deploy
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+OEI_CONFIGS ?= "UNDEFINED"
+OEI_CORE    ?= "UNDEFINED"
+OEI_SOC     ?= "UNDEFINED"
+OEI_BOARD   ?= "UNDEFINED"
+OEI_DDRCONFIG  ?= ""
+OEI_DEBUG   ?= "0"
+LDFLAGS[unexport] = "1"
+EXTRA_OEMAKE = "\
+    board=${OEI_BOARD} \
+    DEBUG=${OEI_DEBUG} \
+    OEI_CROSS_COMPILE=arm-none-eabi-"
+EXTRA_OEMAKE:append:mx95-generic-bsp = " r=${IMX_SOC_REV}"
+EXTRA_OEMAKE:append = " ${@' DDR_CONFIG=${OEI_DDRCONFIG}' if d.getVar('OEI_DDRCONFIG') else ''}"
+do_configure() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake clean oei=$oei_config
+    done
+}
+do_compile() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake oei=$oei_config
+    done
+}
+do_install() {
+    install -d ${D}/firmware
+    for oei_config in ${OEI_CONFIGS}; do
+        install -m 0644 ${B}/build/${OEI_BOARD}/$oei_config/oei-*.bin ${D}/firmware
+    done
+}
+addtask deploy after do_install
+do_deploy() {
+    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
+}
+FILES:${PN} = "/firmware"
+SYSROOT_DIRS += "/firmware"
+PROVIDES += "virtual/imx-oei"
+COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
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 d07138758..29a58ed08 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
@@ -1,61 +1,17 @@
 SUMMARY = "i.MX Optional Execution Image"
+DESCRIPTION = "\
-LICENSE = "GPL-2.0-only"
+The Optional Executable Image (OEI) is an optional plugin loaded and executed \
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552"
+by Cortex-M processor ROM on many NXP i.MX processors. The Cortex-M is the \
+boot core, runs the boot ROM which loads the OEI, and then branches to the \
-INHIBIT_DEFAULT_DEPS = "1"
+OEI. The OEI then configures some aspects of the hardware such as DDR config, \
-DEPENDS = "gcc-arm-none-eabi-native"
+init TCM ECC, etc. There could be multiple OEI images in the boot container. \
+After execution of OEI, the processor returns to ROM execution."
+LICENSE = "BSD-3-Clause"
+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 = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678"
+SRCREV = "ca91ce798b2f3a2a0bab8c0f835f4bea88c9b080"
-S = "${WORKDIR}/git"
-inherit deploy
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-OEI_CONFIGS ?= "UNDEFINED"
-OEI_CORE    ?= "UNDEFINED"
-OEI_SOC     ?= "UNDEFINED"
-OEI_BOARD   ?= "UNDEFINED"
-LDFLAGS[unexport] = "1"
-EXTRA_OEMAKE = "\
-    board=${OEI_BOARD} \
-    DEBUG=1 \
-    OEI_CROSS_COMPILE=arm-none-eabi-"
-do_configure() {
-    for oei_config in ${OEI_CONFIGS}; do
-        oe_runmake clean oei=$oei_config
-    done
-}
-do_compile() {
-    for oei_config in ${OEI_CONFIGS}; do
-        oe_runmake oei=$oei_config
-    done
-}
-do_install() {
-    install -d ${D}/firmware
-    for oei_config in ${OEI_CONFIGS}; do
-        install -m 0644 ${B}/build/${OEI_BOARD}/$oei_config/oei-*.bin ${D}/firmware
-    done
-}
-addtask deploy after do_install
-do_deploy() {
-    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
-}
-FILES:${PN} = "/firmware"
-SYSROOT_DIRS += "/firmware"
-PROVIDES += "virtual/imx-oei"
-COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
+require imx-oei.inc
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
index d8033622c..1d23a22cd 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -18,7 +18,7 @@ SYSTEM_MANAGER_CONFIG ?= "INVALID"
 LDFLAGS[unexport] = "1"
 EXTRA_OEMAKE = " \
-    V=y \
+    V=1 \
    SM_CROSS_COMPILE=arm-none-eabi- \
    ${PACKAGECONFIG_CONFARGS} \
 "
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
index eceaaa674..55826b016 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
@@ -16,8 +16,6 @@ IMX_SYSTEM_MANAGER_SRC ?= "git://github.com/nxp-imx/imx-sm.git;protocol=https"
 SRCBRANCH = "master"
 SRCREV = "709deccd9338399eb39b5cf99a60eab4fa60d539"
-S = "${WORKDIR}/git"
 require imx-system-manager.inc
 PACKAGECONFIG ??= "m2"
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index 1b527fc69..865b29349 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -6,10 +6,13 @@ SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable"
 DEPENDS:append:mx95-nxp-bsp = " libdrm"
-PACKAGECONFIG:remove:mx6-nxp-bsp = "gstreamer"
+PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
-PACKAGECONFIG:remove:mx7-nxp-bsp = "gstreamer"
+PACKAGECONFIG_REMOVE              ?= ""
-PACKAGECONFIG:remove:mx8-nxp-bsp = "gstreamer"
+PACKAGECONFIG_REMOVE:mx6-nxp-bsp  ?= "gstreamer"
-PACKAGECONFIG:remove:mx93-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)}"
 # FIXME: Needs to qualify on PACKAGECONFIG
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
index 2219a6c04..227b6291b 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
@@ -9,8 +9,6 @@ DEPENDS = "libxml2 fmlib tclap"
 SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1"
 SRCREV = "5b9f4b16a864e9dfa58cdcc860be278a7f66ac18"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
index 659a7cc0a..35a128174 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -6,4 +6,4 @@ PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx"
 # i.MX8 does never provide native x11, so required dependencies are not met
 PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx"
-PACKAGECONFIG:remove:mx95-nxp-bsp = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx9-nxp-bsp = "xcomposite-egl xcomposite-glx"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
index f2b0b8025..9d0cae8f9 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
@@ -4,4 +4,4 @@ PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx"
 PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx"
 PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx"
 PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx"
-PACKAGECONFIG:remove:mx95-nxp-bsp = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx9-nxp-bsp = "xcomposite-egl xcomposite-glx"
diff --git a/recipes-bsp/atf/qoriq-atf-2.6.inc b/recipes-bsp/atf/qoriq-atf-2.12.inc
index d5ef5e75e..a025401e0 100644
--- a/recipes-bsp/atf/qoriq-atf-2.6.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.12.inc
@@ -3,10 +3,7 @@ DESCRIPTION = "ARM Trusted Firmware"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-ATF_BRANCH ?= "lf_v2.6"
+ATF_BRANCH ?= "lf_v2.12"
 ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https"
 SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}"
-SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75"
+SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
-S = "${WORKDIR}/git"
diff --git a/recipes-bsp/atf/qoriq-atf-tools_2.6.bb b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
index 2c1db306c..2c1db306c 100644
--- a/recipes-bsp/atf/qoriq-atf-tools_2.6.bb
+++ b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
diff --git a/recipes-bsp/atf/qoriq-atf_2.6.bb b/recipes-bsp/atf/qoriq-atf_2.12.bb
index 9f2b0e47a..4eb7be9d3 100644
--- a/recipes-bsp/atf/qoriq-atf_2.6.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.12.bb
@@ -7,9 +7,8 @@ do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy"
 PV:append = "+${SRCPV}"
-SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=git/mbedtls;name=mbedtls \
+SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=${S}/mbedtls;name=mbedtls \
-    git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=git/ddr-phy-binary;name=ddr \
+    git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=${S}/ddr-phy-binary;name=ddr \
-    file://tf-a-tests-no-warn-rwx-segments.patch \
 "
 SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708"
 SRCREV_ddr = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb
index 0916b45ba..6b53e228f 100644
--- a/recipes-bsp/boot-format/boot-format_git.bb
+++ b/recipes-bsp/boot-format/boot-format_git.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/boot-format;protocol=https;nobra
           file://flags.patch"
 SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"'
 do_install(){
diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb
index 8ea92502f..5cfeb935e 100644
--- a/recipes-bsp/ddr-phy/ddr-phy_git.bb
+++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb
@@ -7,8 +7,6 @@ inherit deploy
 SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1;protocol=https"
 SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
-S = "${WORKDIR}/git"
 REGLEX = "lx2160a"
 DEPENDS += "qoriq-atf-tools-native"
diff --git a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
index 01e3a2a61..79fff49e6 100644
--- a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
+++ b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
@@ -8,7 +8,7 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-8.16.bin;fsl-eula=true"
 SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84"
-S = "${WORKDIR}/firmware-imx-8.16"
+S = "${UNPACKDIR}/firmware-imx-8.16"
 do_install () {
    install -d ${D}/boot
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb
index d9a6218e7..f776e463d 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb
@@ -3,15 +3,15 @@ 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=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 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 = "19b6ee2"
+IMX_SRCREV_ABBREV = "89161a8"
-SRC_URI[sha256sum] = "14ad172ed70d2f16decca4b55e508dad32923390a298f10a598e8bc7778b6b66"
+SRC_URI[sha256sum] = "2d29f0a4de3662ba15f6a7d9069702d4eaed415d96a17f29d5b127f2c6fdd634"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 do_compile[noexec] = "1"
@@ -24,7 +24,7 @@ do_install() {
 }
 do_deploy () {
-    # Deploy the related firmware to be package by imx-boot
+    # Deploy the related firmware to be packaged by imx-boot
    install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
 }
 addtask deploy after do_install before do_build
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc b/recipes-bsp/firmware-imx/firmware-imx-8.28.inc
index 022289d37..db8a78528 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.28.inc
@@ -1,16 +1,16 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
+# Copyright 2017-2025 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 # 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 = "5af0ceb"
+IMX_SRCREV_ABBREV = "994fa14"
-SRC_URI[sha256sum] = "61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f"
+SRC_URI[sha256sum] = "55996f340e87825685a00cd309901189066ec9545ee607734f942c3cde4d69dc"
-S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.27.bb b/recipes-bsp/firmware-imx/firmware-imx_8.28.bb
index 7bac8106d..2cd449165 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.28.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2021,2024 NXP
+# Copyright 2017-2021,2024-2025 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SUMMARY = "Freescale i.MX firmware"
 DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
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 fe520ea84..51e8b69e4 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 NXP
+# Copyright 2020-2025 NXP
 SUMMARY = "Wi-Fi firmware redistributed by NXP"
 DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
@@ -7,13 +7,12 @@ should be preferred."
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "eef7ef94bc44cacd3b068f66658ef33391547daa"
+SRCREV = "d31ea8aaba67e188ba0071a90da0364e3946c83a"
-S = "${WORKDIR}/git"
 inherit allarch
@@ -69,8 +68,10 @@ PACKAGES =+ " \
    ${PN}-nxp9098-pcie \
    ${PN}-nxp9098-common \
    ${PN}-nxp9098-sdio \
+    ${PN}-nxpaw693-pcie \
    ${PN}-nxpiw416-sdio \
    ${PN}-nxpiw610-sdio \
+    ${PN}-nxpiw610-usb \
    ${PN}-nxpiw612-sdio \
 "
@@ -162,6 +163,7 @@ RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 FILES:${PN}-nxpiw610-sdio += " \
    ${nonarch_base_libdir}/firmware/nxp/sd_iw610.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/sduart_iw610.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/sduartspi_iw610.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/uart_iw610_bt.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/uartspi_iw610.bin.se \
 "
@@ -170,6 +172,11 @@ RPROVIDES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RREPLACES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RCONFLICTS:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
+FILES:${PN}-nxpiw610-usb += " \
+    ${nonarch_base_libdir}/firmware/nxp/usb*_iw610.bin.se \
+"
+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 \
@@ -182,6 +189,12 @@ RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
+FILES:${PN}-nxpaw693-pcie += " \
+    ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
+    ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
+"
+RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
 RDEPENDS:${PN}-all-sdio = " \
    ${PN}-nxp8801-sdio \
    ${PN}-nxp8987-sdio \
@@ -194,4 +207,9 @@ RDEPENDS:${PN}-all-sdio = " \
 RDEPENDS:${PN}-all-pcie = " \
    ${PN}-nxp8997-pcie \
    ${PN}-nxp9098-pcie \
+    ${PN}-nxpaw693-pcie \
+"
+RDEPENDS:${PN}-all-usb = " \
+    ${PN}-nxpiw610-usb \
 "
diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
index 6e6f90cab..7c5022761 100644
--- a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444"
 SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz"
 SRC_URI[sha256sum] = "eb86c90aec92b3b376e7afca6aa5db4767b5d8868553595907ba37665329f16b"
-S = "${WORKDIR}/sof-imx-${PV}"
+S = "${UNPACKDIR}/sof-imx-${PV}"
 inherit allarch
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.28.bb
index c35e31e07..4c0d51c8a 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.28.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 NXP
+# Copyright (C) 2018-2025 NXP
 SUMMARY = "Freescale i.MX Firmware files used for boot"
 require firmware-imx-${PV}.inc
diff --git a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
index 7592a629c..2b5a9f50d 100644
--- a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
+++ b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${UNPACKDIR}/${PN}-${PV}"
 inherit fsl-eula-unpack pkgconfig deploy
diff --git a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
index 3883c0246..260b01001 100644
--- a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
+++ b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/fsl-tlu;protocol=https;nobranch=1"
 SRCREV = "8837cce3c86b30c0931c319e9e1a8ca622ae5354"
-S = "${WORKDIR}/git"
 do_install() {
    install -d ${D}${sbindir}/fsl_tlu
    find . -type f -exec cp {} ${D}${sbindir}/fsl_tlu/ \;
diff --git a/recipes-bsp/imx-atf/imx-atf_2.10.bb b/recipes-bsp/imx-atf/imx-atf_2.12.bb
index 13478bbe6..ba494594f 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.10.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.12.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2024 NXP
+# Copyright (C) 2017-2025 NXP
 DESCRIPTION = "i.MX ARM Trusted Firmware"
 SECTION = "BSP"
@@ -9,10 +9,8 @@ PV .= "+git${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
           file://0001-imx93-trdc-Fix-header-guard.patch"
-SRCBRANCH = "lf_v2.10"
+SRCBRANCH = "lf_v2.12"
-SRCREV = "78a14c75a06dea39036c44ae0f9d23acc7bcaef2"
+SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
-S = "${WORKDIR}/git"
 inherit deploy
diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb
index bdb02475a..4f0ed79a1 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_git.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \
           file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \
 "
 SRCREV = "ff13a99a22aa73cca0e09a33c2ebb6a94ad698da"
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index cff0313e2..5cf1b5744 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -14,11 +14,9 @@ PV = "5.9+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH} \
           file://0001-Fix-gcc-15-errors.patch"
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
 SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
-S = "${WORKDIR}/git"
 inherit use-imx-headers
 PLATFORM:mx6q-nxp-bsp   = "IMX6Q"
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index ad464aee2..a14d98241 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -5,10 +5,8 @@ DEPENDS = "zlib-native openssl-native"
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
           file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "9e60b1f7a87a6397cf8db10e07293075f489e974"
+SRCREV = "4c2e5b25232f5aa003976ddca9d1d2fb9667beb1"
-S = "${WORKDIR}/git"
 BOOT_TOOLS = "imx-boot-tools"
 SYSROOT_DIRS += "/boot"
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
index 1354356b6..42e8f6e19 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 SRC_URI[sha256sum] = "392f1e5cdf1c8d7ed75409a2c46b00a332ace677f0e2700b587fe9ae800a1ff3"
 IMX_SRCREV_ABBREV = "654907b"
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index 353dcb910..fe366aacb 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -16,8 +16,6 @@ SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRA
           file://0001-Fix-return-value-of-void-functions.patch"
 SRCREV = "273553f207425f773400be7a7f3a7c425d892d6f"
-S = "${WORKDIR}/git"
 TARGET_CC_ARCH += "${LDFLAGS}"
 do_install () {
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 352fc49ee..2710297d6 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
@@ -13,7 +13,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 SRC_URI[sha256sum] = "bd8dc01966076836aabff53f2463295294166595006e1db430db21b6ffa6b667"
 IMX_SRCREV_ABBREV = "0333596"
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 do_compile[noexec] = "1"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
index cebfbdf91..525824f79 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -14,8 +14,6 @@ SRCREV = "dffbb844e86f4a49058ffbb40548474059969c27"
 PV = "lf-6.6.52_2.2.0"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE += "PLAT=ele"
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 0a0934694..3dd6153a0 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -14,16 +14,15 @@ 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"
 PE = "1"
 PV = "7.0+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
           file://memtool_profile"
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "92a497313016bfa536d561e13fcbad2d273ded4c"
+SRCREV = "38f9cf1f08bb6fcdd6aaf9191e0b53f02e02537b"
-S = "${WORKDIR}/git"
 inherit module-base use-imx-headers
@@ -42,6 +41,7 @@ PLATFORM:mx8-nxp-bsp = "IMX8"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
 PLATFORM:mx91-nxp-bsp = "IMX8"
 PLATFORM:mx93-nxp-bsp = "IMX8ULP"
+PLATFORM:mx943-nxp-bsp = "IMX8ULP"
 PLATFORM:mx95-nxp-bsp = "IMX8"
 PARALLEL_MAKE = "-j 1"
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index 754e68eb0..54997ae37 100644
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright (C) 2017-2019,2024 NXP
+# Copyright (C) 2017-2019,2024-2025 NXP
 SUMMARY = "A Daemon wait for NXP mfgtools host's command"
 SECTION = "base"
 DEPENDS = "virtual/kernel dosfstools-native"
@@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r1"
 PV = "0.5.1+git${SRCPV}"
-SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/nxp-imx/imx-uuc.git;protocol=https;branch=master"
 SRCREV = "25f65e10368aa07056f9536e88ed911ac7f38f99"
-S = "${WORKDIR}/git"
 do_install() {
    oe_runmake 'DESTDIR=${D}' install
 }
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.10.1.bb
index 5aaf92c5f..68c2a4979 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.10.1.bb
@@ -14,7 +14,7 @@ IMX_SRCREV_ABBREV = "c0244a1"
 SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 # SCR is the location and name of the Software Content Register file
 # relative to ${D}${D_SUBDIR}.
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.5.0.bb
index ac42b6870..940b9fa41 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.5.0.bb
@@ -11,7 +11,7 @@ IMX_SRCREV_ABBREV = "3200e68"
 SRC_URI[sha256sum] = "e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
 PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
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.36.0.bb
index 3a171942f..d766e0191 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
@@ -15,7 +15,7 @@ IMX_SRCREV_ABBREV = "194a305"
 SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack use-imx-headers
diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb
index 4deacb581..5c2e4197f 100644
--- a/recipes-bsp/inphi/inphi_git.bb
+++ b/recipes-bsp/inphi/inphi_git.bb
@@ -7,8 +7,6 @@ inherit deploy
 SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;nobranch=1;protocol=https"
 SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695"
-S = "${WORKDIR}/git"
 do_install () {
    install -d ${D}/boot
    cp -fr ${S}/in112525-phy-ucode.txt ${D}/boot
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
index 550250b2d..012e1f2b7 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
@@ -2,17 +2,17 @@
 DESCRIPTION = "Basler camera binary drivers"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-IMX_SRCREV_ABBREV = "d1f506a"
+IMX_SRCREV_ABBREV = "dd86758"
 inherit fsl-eula-unpack
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[sha256sum] = "49d1b3691d18e2ba5f43a6e2c59ac16767b6e077a118cafec7f51293d6bf30f3"
+SRC_URI[sha256sum] = "aa86adeb0c53c3306f7e1c004ffa78ebb7db3e9136c78759e4029b4b5e1b1a64"
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 do_compile[noexec] = "1"
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
new file mode 100644
index 000000000..617abde6f
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
@@ -0,0 +1,32 @@
+From d24c74528fefd1316f1633f0a7f1a5acea40454f 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
+ configured
+The script currently returns '6' when no known camera is configured
+in the device tree. The end result is that the systemd imx8-isp.service
+goes to the failed state.
+Return '0' in that case as obviously the device tree doesn't have a
+camera configured and the service is not needed.
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ imx/start_isp.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/imx/start_isp.sh b/imx/start_isp.sh
+index d544b4ca2a57..22e7783437d6 100755
+--- a/imx/start_isp.sh
+++ b/imx/start_isp.sh
+@@ -72,5 +72,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
+-       exit 6
+       exit 0
+ fi
+-- 
+2.42.0
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
new file mode 100644
index 000000000..38b3b6b02
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch
@@ -0,0 +1,134 @@
+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
new file mode 100644
index 000000000..f11deb758
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 000000000..087f24090
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch
@@ -0,0 +1,51 @@
+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
new file mode 100644
index 000000000..f4b44ff47
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch
@@ -0,0 +1,36 @@
+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.1.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb
index 25ffdd8a1..445822528 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb
@@ -2,18 +2,25 @@
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
 SRC_URI = " \
    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+    ${@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 \
 "
-IMX_SRCREV_ABBREV = "327f21d"
+ISP_SYSTEMD_PATCH = "file://0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "f57c6fe1c2dd1c8e5991a625d0b3a1dbfdfe6d39a1a116a904d543faa0f4f6f0"
+IMX_SRCREV_ABBREV = "3cac1fb"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-inherit fsl-eula-unpack cmake systemd use-imx-headers
+SRC_URI[sha256sum] = "8fa5094da6438505287f4dcc8033dad3057ab81bf98c858884f7c3a2e521b252"
+inherit fsl-eula-unpack cmake pkgconfig systemd use-imx-headers
 PACKAGECONFIG = ""
 # Note: building with tuningext fails with boost 1.87.
@@ -36,7 +43,6 @@ EXTRA_OECMAKE += " \
    -DCMAKE_BUILD_TYPE=release \
    -DISP_VERSION=ISP8000NANO_V1802 \
    -DPLATFORM=ARM64 \
-    -DTUNINGEXT=1 \
    -DQTLESS=1 \
    -DFULL_SRC_COMPILE=1 \
    -DWITH_DRM=1 \
@@ -48,7 +54,7 @@ EXTRA_OECMAKE += " \
    -Wno-dev \
 "
-do_configure:prepend () {
+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
@@ -59,9 +65,6 @@ do_configure:prepend () {
 }
 do_install() {
-    # FIXME: provided by the basler-camera package, do not install them here additionally
-    rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json
    # The Makefile unconditionally installs tuningext even if it is not built
    if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
        touch ${B}/generated/release/bin/tuningext
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
index 5b04b1e2c..b1cd3d863 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
@@ -13,9 +13,6 @@ SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};pr
           file://run-ptest \
          "
-S = "${WORKDIR}/git"
 inherit pkgconfig waf use-imx-headers ptest
 EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \
diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb
index c13a05a19..60ab5e183 100644
--- a/recipes-bsp/ls2-phy/ls2-phy_git.bb
+++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb
@@ -7,8 +7,6 @@ inherit deploy
 SRC_URI = "git://github.com/nxp/qoriq-firmware-cortina.git;nobranch=1;protocol=https"
 SRCREV = "9143c2a3adede595966583c00ca4edc99ec698cf"
-S = "${WORKDIR}/git"
 do_install () {
    install -d ${D}/boot
    cp -fr ${S}/* ${D}/boot
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index 696307209..2d09bbcc8 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -8,9 +8,7 @@ DEPENDS += "dtc-native"
 inherit deploy
 SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1"
-SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc"
+SRCREV = "f5c4b2c9d2b1d5122a7d97f236894f87959b3831"
-S = "${WORKDIR}/git"
 MC_CFG ?= ""
 MC_CFG:ls1088a = "ls1088a"
diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb
index 17da814f8..9fc6338c4 100644
--- a/recipes-bsp/mxsldr/mxsldr_git.bb
+++ b/recipes-bsp/mxsldr/mxsldr_git.bb
@@ -13,8 +13,6 @@ SRC_URI = "git://git.denx.de/mxsldr.git;branch=master \
 PV = "0.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 inherit pkgconfig
 do_compile() {
diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
index bb542e8c0..ddbb2031c 100644
--- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
+++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
@@ -10,8 +10,6 @@ inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1;protocol=https"
 SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234"
-S = "${WORKDIR}/git"
 do_install () {
    install -d ${D}${nonarch_base_libdir}/firmware
    install -d ${D}/boot/engine-pfe-bin
diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
index 9b76d24a6..582fb1e46 100644
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -8,8 +8,6 @@ inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1;protocol=https"
 SRCREV = "c89d7843943fd3bd52aa5f1ff7a91200a2f7f63b"
-S = "${WORKDIR}/git"
 do_install () {
       install -d ${D}/boot
       install -m 644 ${B}/*.bin ${D}/boot
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index be166f441..6a52861b0 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,9 +8,7 @@ DEPENDS += "tcl-native"
 inherit deploy siteinfo
 SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1"
-SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4"
+SRCREV = "45e69253690452656a4dfe933c4c9f55e1eb0f5f"
-S = "${WORKDIR}/git"
 export PYTHON = "${USRBINPATH}/python3"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
index 134028503..9cc6b958d 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
@@ -16,5 +16,4 @@ SRCBRANCH = "2025.01+fslc"
 PV = "2025.01+fslc+git${SRCPV}"
 CVE_PRODUCT = "denx:u-boot"
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
index 01e3bbca3..9640ba1de 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
@@ -18,7 +18,6 @@ DEPENDS += " \
    xxd-native \
 "
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 inherit fsl-u-boot-localversion
diff --git a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
index 695987801..27c3555f4 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
@@ -23,11 +23,13 @@ do_deploy:append:mx8m-generic-bsp() {
        for config in ${UBOOT_MACHINE}; do
            i=$(expr $i + 1);
            for type in ${UBOOT_CONFIG}; do
+                builddir="${config}-${type}"
                j=$(expr $j + 1);
                if [ $j -eq $i ]
                then
+                    builddir="${config}-${type}"
                    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-                    install -m 0644 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type}
+                    install -m 0644 ${B}/${builddir}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type}
                    UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}"
                    for key_value in ${UBOOT_DTB_NAME_FLAGS}; do
                        local type_key="${key_value%%:*}"
@@ -37,11 +39,11 @@ do_deploy:append:mx8m-generic-bsp() {
                            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}/${config}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
+                                install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
                            else
                                bbwarn "Use custom wks.in for $dtb_name = $type"
                            fi
-                            install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
+                            install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
                        fi
                        unset type_key
                        unset dtb_name
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
index bd495af94..be8433e47 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -10,20 +10,23 @@ LIC_FILES_CHKSUM = " \
    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.0.txt;md5=4cf66a4984120007c9881cc871cf49db \
    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
-SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1"
+PV:append = "+${SRCPV}"
-SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
-S = "${WORKDIR}/git"
+UBOOT_BRANCH ?= "lf_v2025.04"
-B = "${WORKDIR}/build"
+UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https"
+SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}"
+SRCREV = "9383f8387dc76524524da69992db96c22195a57c"
+B = "${UNPACKDIR}/build"
 PV:append = "+fslgit"
 LOCALVERSION = "+fsl"
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native python3-setuptools-native"
+DEPENDS = "libgcc virtual/cross-cc bison-native bc-native gnutls-native swig-native python3-native"
 DEPENDS:append:qoriq-arm64 = " dtc-native"
 DEPENDS:append:qoriq-arm = " dtc-native"
 DEPENDS:append:qoriq-ppc = " boot-format-native"
@@ -40,7 +43,7 @@ python () {
            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR')
+        workdir = d.getVar('UNPACKDIR')
        d.setVar('DEPENDS:append', ' lib32-gcc-cross-powerpc lib32-libgcc')
        d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
@@ -50,7 +53,7 @@ python () {
            raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR')
+        workdir = d.getVar('UNPACKDIR')
        d.setVar('DEPENDS:append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
        d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
@@ -80,8 +83,6 @@ do_compile:append:qoriq() {
                        boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
                            ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
                        cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
-                    elif [ "qspi" = "${type}" ];then
-                        cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
                    fi
                fi
            done
@@ -92,6 +93,48 @@ do_compile:append:qoriq() {
    unset i
 }
+do_deploy:append:lx2162a () {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    if [ "tfa-verified-boot" = "${type}" ];then
+                        builddir="${config}-${type}"
+                        install -m 644 ${B}/${builddir}/u-boot.dtb ${DEPLOYDIR}/u-boot.dtb
+                    fi
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
+do_deploy:append:ls102xa () {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    if expr "$type" : sdcard;then
+                        builddir="${config}-${type}"
+                        install -m 644 ${B}/${builddir}/u-boot-dtb.bin ${DEPLOYDIR}/u-boot-dtb.${UBOOT_SUFFIX}-${type}
+                        install -m 644 ${B}/${builddir}/spl/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl.${UBOOT_SUFFIX}-${type}
+                    fi
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
 PACKAGES += "${PN}-images"
 FILES:${PN}-images += "/boot"
diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index 268b5b1d9..c0222a817 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -8,8 +8,6 @@ inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https"
 SRCREV = "55789d536850e00c6f2284fb28eaf21712cd276b"
-S = "${WORKDIR}/git"
 do_install () {
       if [ -d ${B}/${MACHINE} ]; then
           install -d ${D}/uefi
diff --git a/recipes-core/udev/udev-rules-imx/10-imx.rules b/recipes-core/udev/udev-rules-imx/10-imx.rules
index 6afc1e8e2..ff9237188 100644
--- a/recipes-core/udev/udev-rules-imx/10-imx.rules
+++ b/recipes-core/udev/udev-rules-imx/10-imx.rules
@@ -21,3 +21,6 @@ SUBSYSTEM=="video", MODE="0660"
 KERNEL=="fb[0-9]",  MODE="0660", GROUP="video"
 KERNEL=="gsl_kmod", MODE="0660", GROUP="video"
 KERNEL=="galcore",  MODE="0660", GROUP="video"
+KERNEL=="linux,cma*", NAME="dma_heap", MODE="0664", GROUP="video"
+KERNEL=="mali[0-9]", MODE="0664", GROUP="video"
+KERNEL=="pxp_device", MODE="0664", GROUP="video"
diff --git a/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules
index a96b9458e..c9a6d70bb 100644
--- a/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules
+++ b/recipes-core/udev/udev-rules-qoriq/73-fsl-dpaa-persistent-networking.rules
@@ -9,3 +9,12 @@ SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="1af0000", NAME="fm1-m
 # Rename macless0 to "macless0"
 SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="macless0"
+# Rules for handling the Upstream DPAA ethernet ports
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae0000*", NAME="fm1-mac1"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae2000*", NAME="fm1-mac2"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae4000*", NAME="fm1-mac3"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae6000*", NAME="fm1-mac4"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae8000*", NAME="fm1-mac5"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1aea000*", NAME="fm1-mac6"
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1af0000*", NAME="fm1-mac9"
diff --git a/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules b/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules
index 42931d475..79a10250a 100644
--- a/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules
+++ b/recipes-core/udev/udev-rules-qoriq/74-ls1046a-xfi2-networking.rules
@@ -1 +1,5 @@
+# Rules for handling the SDK DPAA ethernet ports
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="1af2000", NAME="fm1-mac10"
+# Rules for handling the Upstream DPAA ethernet ports
+SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1af2000*", NAME="fm1-mac10"
diff --git a/recipes-devtools/devregs/devregs_git.bb b/recipes-devtools/devregs/devregs_git.bb
index f24cb0f6e..9d2155e1f 100644
--- a/recipes-devtools/devregs/devregs_git.bb
+++ b/recipes-devtools/devregs/devregs_git.bb
@@ -8,6 +8,4 @@ SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=https;branch=ma
 PV = "1.0+${SRCPV}"
-S = "${WORKDIR}/git"
 inherit autotools
diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
index deffd8539..c14fd955b 100644
--- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
+++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
@@ -10,8 +10,6 @@ SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;br
 PV = "1.0+${SRCPV}"
-S = "${WORKDIR}/git"
 do_install () {
        oe_runmake DESTDIR=${D} install
 }
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
index 5ac774ed2..cb415d66b 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -15,9 +15,7 @@ SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \
           file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \
           "
-SRCREV = "14fda5a42df6c72e890d6a97ff88c5852172604b"
+SRCREV = "a46ddbbe661677dcfa342f00ab7ab71e5f6f1a09"
-S = "${WORKDIR}/git"
 python() {
    d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', ''))
diff --git a/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch
deleted file mode 100644
index d25675aae..000000000
--- a/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 81ec65e72f357fb2c395e40c5195434bbaddf7f7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 16 May 2020 08:21:52 -0700
-Subject: [PATCH] tools: Mark struct input_field file_field extern
-This struct is already defined in common/parse_utils.c
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- tools/header_generation/create_hdr_common.c | 2 +-
- tools/pbi_creation/create_pbi_common.c      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/tools/header_generation/create_hdr_common.c b/tools/header_generation/create_hdr_common.c
-index bfa90a3..edf632c 100644
--- a/tools/header_generation/create_hdr_common.c
-+++ b/tools/header_generation/create_hdr_common.c
-@@ -39,7 +39,7 @@
- #include <crypto_utils.h>
- 
- extern struct g_data_t gd;
-struct input_field file_field;
-+extern struct input_field file_field;
- 
- extern char line_data[];
- static struct option long_options[] = {
-diff --git a/tools/pbi_creation/create_pbi_common.c b/tools/pbi_creation/create_pbi_common.c
-index ff2ed84..bd976da 100644
--- a/tools/pbi_creation/create_pbi_common.c
-+++ b/tools/pbi_creation/create_pbi_common.c
-@@ -57,7 +57,7 @@ static char *parse_list[] = {
- 
- extern struct g_data_t gd;
- extern char line_data[];
-struct input_field file_field;
-+extern struct input_field file_field;
- 
- #define NUM_PARSE_LIST (sizeof(parse_list) / sizeof(char *))
- 
-- 
-2.26.2
diff --git a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
index bcb4f8bfe..eb01f5427 100644
--- a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
+++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
@@ -16,12 +16,8 @@ inherit kernel-arch
 #SECURE_PRI_KEY = "/path/srk.pri"
 #SECURE_PUB_KEY = "/path/srk.pub"
-SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \
+SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1"
-           file://0001-tools-Mark-struct-input_field-file_field-extern.patch \
+SRCREV = "892d2ed3207d78a3cb5533eeb91bcc73967e3e36"
-"
-SRCREV = "e96dead3c339f6addb1600249be67e1884cdbcc5"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"'
 CFLAGS:append = ' -Wno-deprecated-declarations'
@@ -41,3 +37,5 @@ do_install () {
 FILES:${PN}-dbg += "${bindir}/cst/.debug"
 BBCLASSEXTEND = "native nativesdk"
+INSANE_SKIP:${PN}-dbg += " buildpaths"
diff --git a/recipes-devtools/utp-com/utp-com_git.bb b/recipes-devtools/utp-com/utp-com_git.bb
index 85c80acbd..364c91bcc 100644
--- a/recipes-devtools/utp-com/utp-com_git.bb
+++ b/recipes-devtools/utp-com/utp-com_git.bb
@@ -11,8 +11,6 @@ SRC_URI = " \
 PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 do_configure[noexec] = "1"
 do_compile () {
diff --git a/recipes-devtools/uuu/uuu-bin_1.5.165.bb b/recipes-devtools/uuu/uuu-bin_1.5.233.bb
index 61c3927ca..ec2f40e00 100644
--- a/recipes-devtools/uuu/uuu-bin_1.5.165.bb
+++ b/recipes-devtools/uuu/uuu-bin_1.5.233.bb
@@ -11,20 +11,23 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec
 SRC_URI = " \
    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu;downloadfilename=uuu-${PV};name=Linux \
-    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac;downloadfilename=uuu-${PV}_mac;name=Mac \
+    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac_x86;downloadfilename=uuu-${PV}_mac_x86;name=Mac_x86 \
+    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac_arm;downloadfilename=uuu-${PV}_mac_arm;name=Mac_arm \
    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu.exe;downloadfilename=uuu-${PV}.exe;name=Windows \
 "
-SRC_URI[Linux.sha256sum] = "f863bba022202361d19e5026be0af408d307f78d2dbf2c139fb7eaaabd220442"
+SRC_URI[Linux.sha256sum] = "c609fe6c4d9656102f7e3139a70488ba3988c33332486c89e5fc6d85ccedd96a"
-SRC_URI[Mac.sha256sum] = "62da0bd7e333931fba100823aa50133621c7e6047be0546bc12e29c0ea78a4d8"
+SRC_URI[Mac_x86.sha256sum] = "cdbacab592661900d46e7f97f9c7dd8a720bf46b1c17f4dbb65adb372f5fc6cf"
-SRC_URI[Windows.sha256sum] = "013ed8bb45e21b971b6b3a5802c5f154733913714bece0b020cb770a809cd206"
+SRC_URI[Mac_arm.sha256sum] = "6f8854946dfbeeb36894baf0f5f555b918974d465f4b541457e65c926fdd6a6a"
+SRC_URI[Windows.sha256sum] = "a3c7241650c05dd6373a6aef086b34322c013103da729c1b446ec86694309939"
 inherit allarch
 do_install() {
-    install -D -m 0755 ${UNPACKDIR}/uuu-${PV}     ${D}${libdir}/uuu/uuu
+    install -D -m 0755 ${UNPACKDIR}/uuu-${PV}           ${D}${libdir}/uuu/uuu
-    install -D -m 0755 ${UNPACKDIR}/uuu-${PV}_mac ${D}${libdir}/uuu/uuu_mac
+    install -D -m 0755 ${UNPACKDIR}/uuu-${PV}_mac_x86   ${D}${libdir}/uuu/uuu_mac_x86
-    install -D -m 0644 ${UNPACKDIR}/uuu-${PV}.exe ${D}${libdir}/uuu/uuu.exe
+    install -D -m 0755 ${UNPACKDIR}/uuu-${PV}_mac_arm   ${D}${libdir}/uuu/uuu_mac_arm
+    install -D -m 0644 ${UNPACKDIR}/uuu-${PV}.exe       ${D}${libdir}/uuu/uuu.exe
 }
 # HACK! We are not aiming to run those binaries during the build but copy then for MFGTOOL bundle.
diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb
index e48698a8b..3af8bc569 100644
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/recipes-devtools/uuu/uuu_git.bb
@@ -3,16 +3,14 @@ DESCRIPTION = "Image deploy tool for i.MX chips"
 HOMEPAGE = "https://github.com/nxp-imx/mfgtools"
 SRC_URI = "git://github.com/nxp-imx/mfgtools.git;protocol=https;branch=master"
-SRCREV = "7347a80c7a943dd7e9081d9d2bab9e6ca8e0ba07"
+SRCREV = "79ce7d2b2e7459e7b7c94f902d172c30b08884ab"
-PV = "1.5.165"
+PV = "1.5.233"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5"
 inherit cmake pkgconfig
-S = "${WORKDIR}/git"
 DEPENDS = "libusb zlib bzip2 openssl zstd libtinyxml2"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-downgrade/glslang/glslang/0001-generate-glslang-pkg-config.patch b/recipes-downgrade/glslang/glslang/0001-generate-glslang-pkg-config.patch
new file mode 100644
index 000000000..337a999bf
--- /dev/null
+++ b/recipes-downgrade/glslang/glslang/0001-generate-glslang-pkg-config.patch
@@ -0,0 +1,46 @@
+From 4cede5edcff96134baf35953d58595c4aa5f1fc5 Mon Sep 17 00:00:00 2001
+From: Jose Quaresma <quaresma.jose@gmail.com>
+Date: Sun, 7 Feb 2021 01:30:39 +0000
+Subject: [PATCH] generate glslang pkg-config
+Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch
+Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
+Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
+---
+ glslang/CMakeLists.txt      |  2 ++
+ glslang/glslang.pc.cmake.in | 11 +++++++++++
+ 2 files changed, 13 insertions(+)
+ create mode 100644 glslang/glslang.pc.cmake.in
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index 37eecaad..6974935c 100644
+--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
+@@ -251,6 +251,8 @@ if(PROJECT_IS_TOP_LEVEL)
+         ")
+         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+     endif()
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+     set(PUBLIC_HEADERS
+         Public/ResourceLimits.h
+diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in
+new file mode 100644
+index 00000000..43104e68
+--- /dev/null
+++ b/glslang/glslang.pc.cmake.in
+@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@
+Description: OpenGL and OpenGL ES shader front end and validator
+Requires:
+Version: @GLSLANG_VERSION@
+Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper
+Cflags: -I${includedir}
diff --git a/recipes-downgrade/glslang/glslang/0002-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch b/recipes-downgrade/glslang/glslang/0002-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch
new file mode 100644
index 000000000..9f9270e6e
--- /dev/null
+++ b/recipes-downgrade/glslang/glslang/0002-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch
@@ -0,0 +1,33 @@
+From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 2 Aug 2024 22:44:21 +0100
+Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
+Without the change `glslang` build fails on upcoming `gcc-15` as:
+    In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
+    SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
+      248 |     Id makeDebugLexicalBlock(uint32_t line);
+          |                              ^~~~~~~~
+---
+ SPIRV/SpvBuilder.h | 1 +
+ 1 file changed, 1 insertion(+)
+Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd]
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
+index f86dd81b3..d688436a6 100644
+--- a/SPIRV/SpvBuilder.h
+++ b/SPIRV/SpvBuilder.h
+@@ -56,6 +56,7 @@ namespace spv {
+ }
+ 
+ #include <algorithm>
+#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
+-- 
+2.34.1
diff --git a/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb b/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
new file mode 100644
index 000000000..7b3c2f606
--- /dev/null
+++ b/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
@@ -0,0 +1,36 @@
+SUMMARY = "OpenGL / OpenGL ES Reference Compiler"
+DESCRIPTION = "Glslang is the official reference compiler front end for the \
+OpenGL ES and OpenGL shading languages. It implements a strict interpretation \
+of the specifications for these languages. It is open and free for anyone to use, \
+either from a command line or programmatically."
+SECTION = "graphics"
+HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
+LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
+SRCREV = "a91631b260cba3f22858d6c6827511e636c2458a"
+SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \
+           file://0001-generate-glslang-pkg-config.patch \
+           file://0002-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch"
+PE = "1"
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
+inherit cmake python3native
+DEPENDS = "spirv-tools"
+EXTRA_OECMAKE = " \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_PCH=OFF \
+    -DENABLE_CTEST=OFF \
+    -DBUILD_EXTERNAL=OFF \
+    -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
+"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
index 598a8fc20..caaf2cd38 100644
--- a/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
+++ b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
@@ -13,7 +13,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 inherit cmake
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
index 05c6de1b5..6b0c0a3f7 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
@@ -16,7 +16,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 inherit cmake
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
index aacec8cab..24630d0db 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
@@ -13,8 +13,6 @@ SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol
 SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40"
-S = "${WORKDIR}/git"
 inherit cmake
 FILES:${PN} += "${datadir}/vulkan"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
index 7caed6720..24fef1743 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
@@ -12,8 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https"
 SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229"
-S = "${WORKDIR}/git"
 REQUIRED_DISTRO_FEATURES = "vulkan"
 inherit cmake features_check pkgconfig
@@ -33,7 +31,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
 PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
 PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
-RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
+RRECOMMENDS:${PN} = "virtual-vulkan-icd"
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
index f86912c90..f5fe8523d 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
 SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664"
-S = "${WORKDIR}/git"
 inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
 REQUIRED_DISTRO_FEATURES = "vulkan"
diff --git a/recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb
new file mode 100644
index 000000000..8ec4cbae9
--- /dev/null
+++ b/recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Vulkan Utility Libraries"
+DESCRIPTION = "Common libraries created to share code across various \
+Vulkan repositories, solving long standing issues for Vulkan SDK \
+developers and users."
+HOMEPAGE = "https://www.khronos.org/vulkan/"
+BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
+SECTION = "libs"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https"
+SRCREV = "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45"
+REQUIRED_DISTRO_FEATURES = "vulkan"
+DEPENDS = "vulkan-headers"
+EXTRA_OECMAKE = "\
+    -DBUILD_TESTS=OFF \
+    "
+inherit cmake features_check pkgconfig
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools,
+# vulkan-validation-layers, spirv-headers, spirv-tools,
+# vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
index 239589108..3068dd184 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
@@ -11,8 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https"
 SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2"
-S = "${WORKDIR}/git"
 REQUIRED_DISTRO_FEATURES = "vulkan"
 DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb
index aee2e2348..858442aff 100644
--- a/recipes-dpaa/eth-config/eth-config_git.bb
+++ b/recipes-dpaa/eth-config/eth-config_git.bb
@@ -8,8 +8,6 @@ PR = "r2"
 SRC_URI = "git://github.com/nxp-qoriq/eth-config;protocol=https;nobranch=1"
 SRCREV = "00fa9c6db5813735676b30b1516e30a460d61b28"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = "D=${D}"
 do_install() {
diff --git a/recipes-dpaa/flib/flib_git.bb b/recipes-dpaa/flib/flib_git.bb
index f1ebd87f0..b7eafe627 100644
--- a/recipes-dpaa/flib/flib_git.bb
+++ b/recipes-dpaa/flib/flib_git.bb
@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9f6d1afdf6b0f6b3ba65c25ba589ee53"
 SRC_URI = "git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1"
 SRCREV = "cbb31427466649c07d2ac2739a41bb42f5f6be7c"
-S = "${WORKDIR}/git"
 do_install(){
    oe_runmake install DESTDIR=${D}
 }
diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index 22f04d012..77305958d 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -10,8 +10,6 @@ inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1;protocol=https"
 SRCREV = "41d603a1ad78e0bb61365500828d9f484bf9bf10"
-S = "${WORKDIR}/git"
 REGLEX ?= "${MACHINE}"
 REGLEX:t1023 = "t1024"
 REGLEX:t1040 = "t1040"
diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
index 71ad3df1f..2276ac3c6 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9c7bd5e45d066db084bdb3543d55b1ac"
 PR = "r1"
 SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1"
-SRCREV = "9fb916f255214013aa6003496c47bab0b5add2d9"
+SRCREV = "7a58ecaf0d90d71d6b78d3ac7998282a472c4394"
-S = "${WORKDIR}/git"
 CFLAGS += "-fmacro-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1 \
                -fdebug-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1"
diff --git a/recipes-dpaa2/aiopsl/aiopsl_git.bb b/recipes-dpaa2/aiopsl/aiopsl_git.bb
index 68f7a8ded..b57e33afd 100644
--- a/recipes-dpaa2/aiopsl/aiopsl_git.bb
+++ b/recipes-dpaa2/aiopsl/aiopsl_git.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=faf479bdc4702d8033049f97e153f876"
 BASEDEPENDS = ""
-S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/nxp-qoriq/aiopsl;protocol=https;nobranch=1"
 SRCREV = "87d83d8e99770325cc7ad9e10965c9959e7cb828"
diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb
index 7beeb90fe..a40b1672e 100644
--- a/recipes-dpaa2/dce/dce_git.bb
+++ b/recipes-dpaa2/dce/dce_git.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf"
 SRC_URI = "git://github.com/nxp-qoriq/dce;protocol=https;nobranch=1 \
-      git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \
+      git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/lib/qbman_userspace \
      file://0001-support-user-merge.patch \
 "
 SRCREV = "88ef2e8c3845532ee64cea4349fd38fb2bd5f807"
@@ -12,8 +12,6 @@ SRCREV_qbman = "2f92993a9f34e5221d6b36c63b9e30ef703e9ac3"
 SRCREV_FORMAT = "default_qbman"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
 do_install () {
diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
index befc769ef..853dda9d7 100644
--- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
+++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \
 "
 SRCREV = "6ead470dde043f3ca67f1ba19b313dd64ec199e1"
-S = "${WORKDIR}/git"
 TARGET_CC_ARCH += "${LDFLAGS}"
 EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" KERNEL_PATH="${STAGING_KERNEL_DIR}"'
diff --git a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
index 5097e71f2..3b5ae98ed 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
@@ -9,8 +9,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;nobranch=1"
 SRCREV = "7d82686272f8a60b803818bbc7c5396819ee3b06"
-S = "${WORKDIR}/git"
 REGLEX:ls2088a = "ls2088a"
 REGLEX:ls2080a = "ls2080a"
 REGLEX:ls1088a = "ls1088a"
diff --git a/recipes-dpaa2/restool/files/disable-manpage-generation.patch b/recipes-dpaa2/restool/files/disable-manpage-generation.patch
deleted file mode 100644
index 34f2ae2d0..000000000
--- a/recipes-dpaa2/restool/files/disable-manpage-generation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5392152e704ff001c41de03445d668227237a87e Mon Sep 17 00:00:00 2001
-From: Ting Liu <ting.liu@nxp.com>
-Date: Fri, 15 Oct 2021 09:36:04 +0530
-Subject: [PATCH] disable manpage generation
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/Makefile b/Makefile
-index ee669ae..ab6e499 100644
--- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,6 @@ install: restool scripts/ls-main scripts/ls-append-dpl scripts/ls-debug scripts/
-        install -D -m 755 scripts/ls-debug $(DESTDIR)$(bindir)/ls-debug
-        $(foreach symlink, $(RESTOOL_SCRIPT_SYMLINKS), sh -c "cd $(DESTDIR)$(bindir) && ln -sf ls-main $(symlink)" ;)
-        install -D -m 755 scripts/restool_completion.sh $(DESTDIR)$(bindir_completion)/restool
-       install -m 0644 -D $(MANPAGE) $(call get_manpage_destination,$(MANPAGE))
- 
- clean:
-        rm -f $(OBJ) $(MANPAGE) \
-- 
-2.25.1
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index d9e3b630f..596625ece 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -2,12 +2,8 @@ SUMMARY = "DPAA2 Resource Manager Tool"
 LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
-SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \
+SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1"
-    file://disable-manpage-generation.patch \
+SRCREV = "8f73f2600111440d034227966d6ff03ec47d8f1a"
-"
-SRCREV = "8c45e04363bf2a984a87b24d1dac80a286dd40d8"
-S = "${WORKDIR}/git"
 inherit bash-completion
diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb
index c54484be3..93630a20c 100644
--- a/recipes-dpaa2/spc/spc_git.bb
+++ b/recipes-dpaa2/spc/spc_git.bb
@@ -7,8 +7,6 @@ DEPENDS = "libxml2 fmlib tclap"
 SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1"
 SRCREV = "b8d69580e5c6aeeb9f1354ee2faed6e0134eaef4"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
diff --git a/recipes-extended/crconf/crconf_git.bb b/recipes-extended/crconf/crconf_git.bb
index 755365d6d..ed76351e1 100644
--- a/recipes-extended/crconf/crconf_git.bb
+++ b/recipes-extended/crconf/crconf_git.bb
@@ -8,8 +8,6 @@ EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}' SBINDIR='${sbindir}' MANDIR='${mandir}
 SRC_URI = "git://git.code.sf.net/p/crconf/code;protocol=https;nobranch=1"
 SRCREV = "c2b9595d739a9515a86ff3b1980b5cfdfcc42d68"
-S = "${WORKDIR}/git"
 do_install () {
       oe_runmake install  DESTDIR=${D}
 }
diff --git a/recipes-extended/dpdk/dpdk-20.11.inc b/recipes-extended/dpdk/dpdk-20.11.inc
index 90b4c405a..66bcda2ff 100644
--- a/recipes-extended/dpdk/dpdk-20.11.inc
+++ b/recipes-extended/dpdk/dpdk-20.11.inc
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4
 SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1"
 SRCREV = "f74b8bd5ab1c6ff76e956fc202a56aea2d200270"
-S = "${WORKDIR}/git"
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
 CVE_PRODUCT = "data_plane_development_kit"
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index f2ab1370a..eabd18650 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -26,8 +26,6 @@ export RTE_TARGET = "${DPDK_RTE_TARGET}"
 export RTE_OUTPUT = "${S}/${RTE_TARGET}"
 export  MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE += 'ETHTOOL_LIB_PATH="${S}/examples/ethtool/lib/${RTE_TARGET}" RTE_SDK="${S}" \
    OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \
    RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" EXAMPLES_BUILD_DIR="${RTE_TARGET}" \
diff --git a/recipes-extended/jailhouse/files/0001-YOCIMX-9281-1-Fix-gcc15-errors.patch b/recipes-extended/jailhouse/files/0001-YOCIMX-9281-1-Fix-gcc15-errors.patch
new file mode 100644
index 000000000..c1e3eaa25
--- /dev/null
+++ b/recipes-extended/jailhouse/files/0001-YOCIMX-9281-1-Fix-gcc15-errors.patch
@@ -0,0 +1,113 @@
+From 2be7793ca658015470fe0d60c0c973e12ce68d73 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Thu, 12 Jun 2025 06:49:58 -0700
+Subject: [PATCH 1/2] YOCIMX-9281-1: Fix gcc15 errors
+Fix several instances of the following errors:
+```
+| inmates/lib/include/inmate_common.h:87:16: error: cannot use keyword 'true' as enumeration constant
+|    87 | typedef enum { true = 1, false = 0 } bool;
+|       |                ^~~~
+```
+```
+| In file included from configs/arm64/hikey.c:16:
+| include/jailhouse/cell-config.h:318:41: error: initializer-string for array of 'char' truncates NUL terminator but destination lacks 'nonstring' attribute (6 chars into 5 available) [-Werror=unterminated-string-initialization]
+|   318 | #define JAILHOUSE_SYSTEM_SIGNATURE      "JHSYS"
+|       |                                         ^~~~~~~
+| configs/arm64/hikey.c:26:30: note: in expansion of macro 'JAILHOUSE_SYSTEM_SIGNATURE'
+|    26 |                 .signature = JAILHOUSE_SYSTEM_SIGNATURE,
+|       |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+Upstream-Status: Backport [Pending]
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+Signed-off-by: Peng Fan <peng.fan@nxp.com>
+---
+ hypervisor/include/jailhouse/header.h | 2 +-
+ hypervisor/include/jailhouse/types.h  | 2 ++
+ include/jailhouse/cell-config.h       | 4 ++--
+ include/jailhouse/hypercall.h         | 2 +-
+ inmates/lib/include/inmate_common.h   | 2 ++
+ 5 files changed, 8 insertions(+), 4 deletions(-)
+diff --git a/hypervisor/include/jailhouse/header.h b/hypervisor/include/jailhouse/header.h
+index 518bc5cb..324eb94b 100644
+--- a/hypervisor/include/jailhouse/header.h
+++ b/hypervisor/include/jailhouse/header.h
+@@ -55,7 +55,7 @@ struct jailhouse_header {
+        /** Signature "JAILHOUS" used for basic validity check of the
+         * hypervisor image.
+         * @note Filled at build time. */
+-       char signature[8];
+       char signature[8] __attribute__ ((nonstring));
+        /** Size of hypervisor core.
+         * It starts with the hypervisor's header and ends after its bss
+         * section. Rounded up to page boundary.
+diff --git a/hypervisor/include/jailhouse/types.h b/hypervisor/include/jailhouse/types.h
+index 6d78ad6d..f79d7428 100644
+--- a/hypervisor/include/jailhouse/types.h
+++ b/hypervisor/include/jailhouse/types.h
+@@ -19,7 +19,9 @@
+ 
+ #ifndef __ASSEMBLY__
+ 
+#if __GNUC__ < 15
+ typedef enum { true = 1, false = 0 } bool;
+#endif
+ 
+ /** Describes a CPU set. */
+ struct cpu_set {
+diff --git a/include/jailhouse/cell-config.h b/include/jailhouse/cell-config.h
+index 17d59306..affce1c2 100644
+--- a/include/jailhouse/cell-config.h
+++ b/include/jailhouse/cell-config.h
+@@ -91,7 +91,7 @@
+  * structure.
+  */
+ struct jailhouse_cell_desc {
+-       char signature[5];
+       char signature[5] __attribute__ ((nonstring));
+        __u8 architecture;
+        __u16 revision;
+ 
+@@ -330,7 +330,7 @@ struct jailhouse_pio {
+  * General descriptor of the system.
+  */
+ struct jailhouse_system {
+-       char signature[5];
+       char signature[5] __attribute__ ((nonstring));
+        __u8 architecture;
+        __u16 revision;
+ 
+diff --git a/include/jailhouse/hypercall.h b/include/jailhouse/hypercall.h
+index 07574d3d..cf58a4c9 100644
+--- a/include/jailhouse/hypercall.h
+++ b/include/jailhouse/hypercall.h
+@@ -107,7 +107,7 @@
+ 
+ #define COMM_REGION_GENERIC_HEADER                                     \
+        /** Communication region magic JHCOMM */                        \
+-       char signature[6];                                              \
+       char signature[6] __attribute__ ((nonstring));                                          \
+        /** Communication region ABI revision */                        \
+        __u16 revision;                                                 \
+        /** Cell state, initialized by hypervisor, updated by cell. */  \
+diff --git a/inmates/lib/include/inmate_common.h b/inmates/lib/include/inmate_common.h
+index 1c20a0af..43cd7a20 100644
+--- a/inmates/lib/include/inmate_common.h
+++ b/inmates/lib/include/inmate_common.h
+@@ -84,7 +84,9 @@ typedef u32 __u32;
+ typedef s64 __s64;
+ typedef u64 __u64;
+ 
+#if __GNUC__ < 15
+ typedef enum { true = 1, false = 0 } bool;
+#endif
+ 
+ #include <jailhouse/hypercall.h>
+ 
+-- 
+2.34.1
diff --git a/recipes-extended/jailhouse/files/0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch b/recipes-extended/jailhouse/files/0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch
new file mode 100644
index 000000000..4c8fefa36
--- /dev/null
+++ b/recipes-extended/jailhouse/files/0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch
@@ -0,0 +1,34 @@
+From 98f6f8dc23d6b3d4fe5b15045ccb3d3ef36747be Mon Sep 17 00:00:00 2001
+From: Peng Fan <peng.fan@nxp.com>
+Date: Mon, 25 Aug 2025 09:48:05 +0800
+Subject: [PATCH 2/2] YOCIMX-9281-2: hypervisor: arm64: fix strh usage
+hypervisor/arch/arm64/entry.S:555: Error: immediate offset out of range
+Per ARM spec:
+STRH (immediate)
+<pimm> Is the optional positive immediate byte offset, a multiple of 2 in
+the range 0 to 8190, defaulting to 0 and encoded in the "imm12" field
+as <pimm>/2.
+So align sdei_event to 2 bytes aligned.
+Upstream-Status: Pending
+Signed-off-by: Peng Fan <peng.fan@nxp.com>
+---
+ hypervisor/arch/arm64/include/asm/percpu_fields.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/hypervisor/arch/arm64/include/asm/percpu_fields.h b/hypervisor/arch/arm64/include/asm/percpu_fields.h
+index 32f42a53..844a9417 100644
+--- a/hypervisor/arch/arm64/include/asm/percpu_fields.h
+++ b/hypervisor/arch/arm64/include/asm/percpu_fields.h
+@@ -18,4 +18,4 @@
+        bool suspended;                                                 \
+        bool suspending;                                                \
+        bool resuming;                                                  \
+-       bool sdei_event;
+       bool sdei_event __attribute__((aligned(2)));
+-- 
+2.34.1
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index 2d0f2ff5c..4bcb597e7 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -16,12 +16,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 PROVIDES = "jailhouse"
 RPROVIDES:${PN} += "jailhouse"
-SRCBRANCH = "lf-6.6.52_2.2.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "44dd492a745cd8b8313fb6c7c03fb45a36d70e8a"
+SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46"
+PV = "2023.03+git${SRCPV}"
 IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
 SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
           file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \
+           file://0001-YOCIMX-9281-1-Fix-gcc15-errors.patch \
+           file://0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch \
          "
 DEPENDS = " \
@@ -33,7 +37,6 @@ DEPENDS = " \
 inherit module bash-completion deploy setuptools3
-S = "${WORKDIR}/git"
 B = "${S}"
 JH_ARCH = "arm64"
@@ -107,6 +110,12 @@ RDEPENDS:pyjailhouse = " \
    python3-shell \
 "
-INSANE_SKIP:${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags buildpaths"
+INSANE_SKIP:${PN}-dbg = "buildpaths"
+# The QA error in package kernel-module-${KERNEL_VERSION} cannot be skipped with
+# INSANE_SKIP, so adjust at the ERROR_QA level
+ERROR_QA:remove = "buildpaths"
+INSANE_SKIP:kernel-module-${KERNEL_VERSION} = "buildpaths"
 COMPATIBLE_MACHINE = "(mx8m-nxp-bsp|mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index ca9f87ee8..347a8ef9a 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -9,8 +9,6 @@ SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741"
 DEPENDS = "openssl secure-obj"
-S = "${WORKDIR}/git"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export CROSS_COMPILE_HOST = "${CROSS_COMPILE}"
 export CROSS_COMPILE_TA = "${CROSS_COMPILE}"
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 0c90d0c57..412667f01 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -10,8 +10,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/odp:"
 SRC_URI = " \
 git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \
-git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \
+git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/platform/linux-dpaa2/flib/qbman \
-git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \
+git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=${S}/platform/linux-dpaa2/flib/rta \
 "
 SRC_URI += "file://0001-Fix-this-build-error.patch"
@@ -22,6 +22,5 @@ SRCREV_qbman = "75ff61a7ca6acdbdbb780161b053cbcbc990f1be"
 SRCREV_rta = "bbab28b03ae21c52ce913f8b052acf53bd24ff5d"
 SRCREV_FORMAT = "default_qbman_rta"
-S = "${WORKDIR}/git"
 COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1088a)"
diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb
index 47e543154..0f90dc5bb 100644
--- a/recipes-extended/ofp/ofp_git.bb
+++ b/recipes-extended/ofp/ofp_git.bb
@@ -10,8 +10,6 @@ SRC_URI = "git://github.com/nxp-qoriq/ofp;protocol=https;nobranch=1"
 SRCREV = "fe66f4659f7d356f7aa73a8fb32fcf67c6cf1108"
-S = "${WORKDIR}/git"
 inherit autotools-brokensep pkgconfig
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
index 20d06dd61..a21bc69cf 100644
--- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
@@ -10,8 +10,6 @@ inherit python3native pkgconfig
 SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1"
 SRCREV = "f2c0744d2f68c4cd2840d6e409d7b0520e4caf99"
-S = "${WORKDIR}/git"
 do_configure() {
        export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
        ${S}/boot.sh
diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
index f04e1e9f5..485f763bf 100644
--- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
+++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
@@ -9,8 +9,6 @@ SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=https;nobranch=1 \
 "
 SRCREV = "3a09aa916597fb9a97ee8eec50044cbdb9c4abde"
-S = "${WORKDIR}/git"
 DPAA_VER ?= "dpaa"
 export RTE_TARGET = "arm64-${DPAA_VER}-linuxapp-gcc"
 export RTE_SDK = "${RECIPE_SYSROOT}/usr/share/dpdk"
diff --git a/recipes-extended/secure-obj/secure-obj-module_git.bb b/recipes-extended/secure-obj/secure-obj-module_git.bb
index 1e5709b6d..c6bbc41df 100644
--- a/recipes-extended/secure-obj/secure-obj-module_git.bb
+++ b/recipes-extended/secure-obj/secure-obj-module_git.bb
@@ -6,6 +6,6 @@ DEPENDS += "virtual/kernel"
 inherit module 
-S = "${WORKDIR}/git/securekeydev"
+S = "${UNPACKDIR}/${BP}/securekeydev"
 EXTRA_OEMAKE += 'KERNEL_SRC="${STAGING_KERNEL_DIR}"'
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 64f59f474..4d197f57c 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -2,8 +2,6 @@ require secure-obj.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-S = "${WORKDIR}/git"
 DEPENDS:remove = " python3-pycryptodomex-native"
 DEPENDS:append = " python3-cryptography-native optee-os-qoriq-tadevkit"
 RDEPENDS:{PN}  += "secure-obj-module"
diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index c08c94923..72638766c 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=
 "
 SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'ARCH=${TARGET_ARCH} MACHINE=${MACHINE} EXTRA_LDFLAGS="${LDFLAGS}"'
 export LIBEDIT_CFLAGS = "`pkg-config --cflags libedit`"
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
index c5ea96a58..45e9365da 100644
--- a/recipes-extended/testfloat/testfloat_2a.bb
+++ b/recipes-extended/testfloat/testfloat_2a.bb
@@ -13,7 +13,7 @@ SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \
 SRC_URI[TestFloat.sha256sum] = "84d14aa42adefbda2ec9708b42946f7fa59f93689b042684bd027863481f8e4e"
 SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515d56c5f18f2febf81"
-S = "${WORKDIR}/TestFloat-2a"
+S = "${UNPACKDIR}/TestFloat-2a"
 do_unpack2(){
    mv ${UNPACKDIR}/SoftFloat-2b ${S}/SoftFloat-2b
diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb
index 2ad4a0c49..f70e64e2b 100644
--- a/recipes-extended/tsntool/tsntool_git.bb
+++ b/recipes-extended/tsntool/tsntool_git.bb
@@ -16,8 +16,6 @@ SRC_URI:append = " \
        file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \
 "
-S = "${WORKDIR}/git"
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 do_compile:prepend() {
diff --git a/recipes-fsl/mcore-demos/README b/recipes-fsl/mcore-demos/README
index addd1c376..389e46bba 100644
--- a/recipes-fsl/mcore-demos/README
+++ b/recipes-fsl/mcore-demos/README
@@ -1,11 +1,13 @@
 The M4 demo app version of each SoCs are followed:
-* 2.16.000 -- i.MX 7ULP, 8MQ, 8MM
+* 2.16.000 -- i.MX 7ULP
+* 25.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:
-* 2.16.000 --  i.MX 8MP , 8MNULite, 8MN
+* 25.03.00 --  i.MX 8MP , 8MNULite, 8MN
-* 24.12.00 --  i.MX95
+* 25.06.00 --  i.MX95
 The M33 demo app version of each SoCs are followed:
-* 2.16.000 --  i.MX 8ULP, i.MX 93
+* 25.03.00 --  i.MX 8ULP
+* 25.06.00 --  i.MX 93
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb
deleted file mode 100644
index e1d303e3d..000000000
--- a/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2023-2024 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-require imx-mcore-demos.inc
-LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-SRC_URI[imx8ulp.sha256sum] = "2d1d48eb3f01d020917f42281581835a3c085233e9764ec845940c1e49ac317b"
-SRC_URI[imx93.sha256sum] = "c954b9bc32cfdea9b696fa0b02f934812054e3ab445b5dd8eb7898d427e47526"
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb b/recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb
new file mode 100644
index 000000000..3f4bdf04e
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb
@@ -0,0 +1,11 @@
+# Copyright 2023-2025 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+require imx-mcore-demos.inc
+LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+SRC_URI[imx8ulp.sha256sum] = "8147efc6b1da5aa9bbda8cc06c8aa0d03455f74d8c85a988db5e3f839717e190"
+COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb b/recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb
new file mode 100644
index 000000000..75add4585
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb
@@ -0,0 +1,11 @@
+# Copyright 2023-2025 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+require imx-mcore-demos.inc
+LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+SRC_URI[imx93.sha256sum] = "275256ab9a7aca0b72dbd2ddb4f237f2ad9b02a83ae63242b2d9e6804a918b93"
+COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
index 6791553bf..489e6f8a9 100644
--- a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
@@ -6,7 +6,7 @@ require imx-mcore-demos.inc
 LIC_FILES_CHKSUM:mx7d-nxp-bsp = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 SRC_URI = "${FSL_MIRROR}/${SOC}-m4-freertos-${PV}.bin;fsl-eula=true"
-S = "${WORKDIR}/${SOC}-m4-freertos-${PV}"
+S = "${UNPACKDIR}/${SOC}-m4-freertos-${PV}"
 SRC_URI[sha256sum] = "cc00d3b936d49b2794a2a99e10129437e70caba3fd26b8379b8c50dd22f73254"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb
index 813b3025d..749433ca0 100644
--- a/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb
@@ -4,13 +4,7 @@
 require imx-mcore-demos.inc
 LIC_FILES_CHKSUM:mx7ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 SRC_URI[imx7ulp.sha256sum] = "1fbb26f8e0a69a2e3925e07cf0cc4a13b13e3ff6321a2ba3dc39c454c82b398b"
-SRC_URI[imx8mm.sha256sum] = "a335b54b797c37be05c5b4e6aeabd02099f401de907186723361d1fc25ea3f24"
+COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp)"
-SRC_URI[imx8mq.sha256sum] = "09b7195ce553dae5808afcefaf6f76c79f7122ce4dd31fabd679b768607dea25"
-COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb b/recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb
new file mode 100644
index 000000000..7c59ccfba
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb
@@ -0,0 +1,13 @@
+# Copyright 2017-2025 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+require imx-mcore-demos.inc
+LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+SRC_URI[imx8mm.sha256sum] = "30fcf9032a3bd71211b8df03c654acf98d5dd4631d18a34635d5b1ba61201d6c"
+SRC_URI[imx8mq.sha256sum] = "652c0521587d9594d56115b549b23d75ea598237f36a79d5a7eede97d9f56574"
+COMPATIBLE_MACHINE = "(mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb
deleted file mode 100644
index 387d6527a..000000000
--- a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2023-2024 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-require imx-mcore-demos.inc
-LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-SRC_URI[imx8mn.sha256sum] = "ab608d621c8d74f42514799a732414184bd22f058a8a87a0ab75147a0fd5d99c"
-SRC_URI[imx8mnddr3l.sha256sum] = "9c9477db2581640395ec3bc7524f89c2c09ffd2947d9186959343a8cf764ad28"
-SRC_URI[imx8mp.sha256sum] = "672af1e1d8fcc1ebd12b45c6dc4cfc7abc85ea9ebbf114d15f4bfe7540e24ea1"
-SRC_URI[imx95.sha256sum] = "8d394b62a4fbad8303acf43f9f8672e5d1c17f1af8f47d7665740272819c0cc1"
-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-m7-demos_24.12.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_24.12.00.bb
deleted file mode 100644
index 17d90903a..000000000
--- a/recipes-fsl/mcore-demos/imx-m7-demos_24.12.00.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2023-2024 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-require imx-mcore-demos.inc
-LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
-SRC_URI[imx95.sha256sum] = "01603b53fd01181631b71f5139a4a3e215f7e03cc531638ef4fa805a678ede3d"
-COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
new file mode 100644
index 000000000..0527ddffd
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
@@ -0,0 +1,19 @@
+# Copyright 2023-2025 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+require imx-mcore-demos.inc
+LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+SRC_URI[imx8mn.sha256sum] = "66e160a4267efcd2660b932d46ad6bcc645c9f2865c8ea873d4194d67fcf342c"
+SRC_URI[imx8mnddr3l.sha256sum] = "45c770ed5539c5e0d5dd8aee2ad0a6ef91b28c99be3aaa9f336bda6ec34a7083"
+SRC_URI[imx8mp.sha256sum] = "94b85ec4dcbf1664a8997e3cfb7bde6b7f1e5825482096302971a7da853b145f"
+COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb
new file mode 100644
index 000000000..608b2dc45
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb
@@ -0,0 +1,11 @@
+# Copyright 2023-2025 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+require imx-mcore-demos.inc
+LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+SRC_URI[imx95.sha256sum] = "8b33ca53bd2692ba92fe928c42d0ec75f1abd3f33879f71660efca9983e9eb88"
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos.inc b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
index b8e747105..9b9553fcc 100644
--- a/recipes-fsl/mcore-demos/imx-mcore-demos.inc
+++ b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
@@ -35,7 +35,7 @@ MCORE_TYPE:mx95-nxp-bsp  = "m7"
 SRC_URI = "${FSL_MIRROR}/${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true"
-S = "${WORKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}"
+S = "${UNPACKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}"
 SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt"
diff --git a/recipes-graphics/drm/libdrm_2.4.123.imx.bb b/recipes-graphics/drm/libdrm_2.4.123.imx.bb
index 81b97782e..e4208cff3 100644
--- a/recipes-graphics/drm/libdrm_2.4.123.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.123.imx.bb
@@ -16,8 +16,6 @@ IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https"
 SRCBRANCH = "libdrm-imx-2.4.123"
 SRCREV = "c7c4953161a0f8f2cc7bee70284bf3263c9cfcf5"
-S = "${WORKDIR}/git"
 DEFAULT_PREFERENCE = "-1"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.4.0.0.bb
index 77f01d793..4e3444b9d 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.4.0.0.bb
@@ -1,10 +1,10 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
+# Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359" 
 DEPENDS = "libdrm ${LIBGAL_IMX}"
 LIBGAL_IMX        = ""
@@ -15,15 +15,15 @@ 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 = "8d2a88d"
+IMX_SRCREV_ABBREV = "9e8bbf1"
 IMX_SRC_URI_NAME = "v1"
-SRC_URI[v1.sha256sum] = "20325a7c6090b79e012339aed25fa4c3b760efcc32be339e389a36a15e44bdfc"
+SRC_URI[v1.sha256sum] = "67be9b56a5d2196613460d3cc3a734d7a088e2177377e27f83287766d5d8cf70"
-IMX_SRCREV_ABBREV:imxmali = "8d2a88d"
+IMX_SRCREV_ABBREV:imxmali = "9e8bbf1"
 IMX_SRC_URI_NAME:imxmali = "v2"
-SRC_URI[v2.sha256sum] = "eb7108256cb55d996c07f6941d0d4a76beaf73458494b2c902d907bc8228eeeb"
+SRC_URI[v2.sha256sum] = "f56dae607f89e0f414625657d8345c5d1b68b79d3ac61e50016fbe4d49a91402"
-S = "${WORKDIR}/${IMX_BIN_NAME}"
+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 884b41ff1..98e976100 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,15 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 DEPENDS = "cairo"
-PV = "2.3+git${SRCPV}"
+PV = "2.4+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.3"
+SRCBRANCH = "imx_2.4"
 SRCREV = "7d12c50c07d73650b4c97906ce917aff429238f8"
-S = "${WORKDIR}/git"
 inherit pkgconfig
 PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}"
@@ -23,6 +21,7 @@ PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp      = "dpu95"
 PACKAGECONFIG_IMPLEMENTATION:imxgpu2d          = "gpu-drm"
 PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev"
 PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp      = "pxp"
+PACKAGECONFIG_IMPLEMENTATION:mx943-nxp-bsp     = "pxp"
 PACKAGECONFIG[dpu] = " \
    BUILD_IMPLEMENTATION=dpu, \
@@ -73,4 +72,4 @@ FILES:${PN} += "/opt"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx95-nxp-bsp)"
+COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx943-nxp-bsp|mx95-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.2.bb
index 1b9d04f63..d1f23d910 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.2.bb
@@ -1,21 +1,21 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
+# Copyright 2017-2022 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"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359" 
 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 = "c600d03"
+IMX_SRCREV_ABBREV = "3c5e429"
-SRC_URI[aarch64.sha256sum] = "e6c336c0b876efab7598a2d7817111772284487f646d5d83c400692f2cdfebe3"
+SRC_URI[aarch64.sha256sum] = "190bc9203e60e5de508e1dcf057b36d2c9bc3667c6972fd12f7df797e508a22d"
-SRC_URI[arm.sha256sum] = "6e1a42f2c570582b8038d1b5c86dbdcd645e75cc10a1db23e716f662d1c1329f"
+SRC_URI[arm.sha256sum] = "aaf9a38fe446af579b16a836bf297f8cb1b2842ca3a784bedc21e32d37271ab4"
-S = "${WORKDIR}/${IMX_BIN_NAME}"
+S = "${UNPACKDIR}/${IMX_BIN_NAME}"
 inherit fsl-eula-unpack
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 7184539e1..8165c0c62 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,29 +1,29 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
+# Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
 PROVIDES += "virtual/libg2d"
-PV = "2.3+git${SRCPV}"
+PV = "2.4+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.3"
+SRCBRANCH = "imx_2.4"
-SRCREV = "f3aabbcb7977a0a17c962c62b02bc829855f8edf"
+SRCREV = "c3368ea82e4507d7b35aee258c28d04f9f8fb8e9"
-S = "${WORKDIR}/git"
 inherit use-imx-headers
-EXTRA_OEMAKE = "PLATFORM=IMX93 INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}"
+EXTRA_OEMAKE = "PLATFORM=${IMX_PLATFORM} INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}"
+IMX_PLATFORM:mx93-nxp-bsp  = "IMX93"
+IMX_PLATFORM:mx943-nxp-bsp = "IMX943"
 do_install() {
    oe_runmake install
 }
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
+COMPATIBLE_MACHINE = "(mx93-nxp-bsp|mx943-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
index 18fad56e9..5dea367a9 100644
--- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
@@ -9,8 +9,6 @@ SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_1
 "
 SRCREV = "522cb2981289b7ba20d6dd4b4bf75097e079815b"
-S = "${WORKDIR}/git"
 inherit cmake pkgconfig perlnative python3native
 PACKAGECONFIG ??= " \
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 b9fe6bb8c..fce1e53ec 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -46,7 +46,7 @@ PROVIDES_OPENCL = " \
    opencl-headers \
    opencl-clhpp \
    opencl-icd-loader \
-    virtual/opencl-icd \
+    virtual/libopencl1 \
 "
 PROVIDES_OPENCL:mx7-nxp-bsp   = ""
 PROVIDES_OPENCL:mx8mm-nxp-bsp = ""
@@ -73,7 +73,7 @@ inherit fsl-eula-unpack
 FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 PACKAGECONFIG ?= ""
@@ -330,7 +330,6 @@ FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/
 INSANE_SKIP:libegl-imx += "dev-so"
 FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
-FILES:libgal-imx-dev:remove = "${includedir}/HAL"
 RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}"
 RPROVIDES:libgal-imx += "libgal-imx"
 RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv"
@@ -347,6 +346,7 @@ FILES:libvulkan-imx = "\
    ${libdir}/libvulkan_VSI${REALSOLIBS} \
    ${sysconfdir}/vulkan"
 FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
+RPROVIDES:libvulkan-imx = "virtual-vulkan-icd"
 FILES:libspirv-imx = " \
    ${libdir}/libSPIRV_viv${SOLIBS} \
@@ -360,7 +360,7 @@ FILES:libopenvx-imx = " \
    ${libdir}/libArchModelSw${SOLIBS} \
 "
 FILES:libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}"
-RDEPENDS:libopenvx-imx = "libnn-imx ${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}"
+RDEPENDS:libopenvx-imx = "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}"
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES               = ""
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx-dev"
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch32.bb
deleted file mode 100644
index 9fbb7e924..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch32.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
-IMX_SRCREV_ABBREV = "c600d03"
-SRC_URI[sha256sum] = "fe8fc231f18047b9547a038e111c08e855760190d0e9848ead22b383d793499d"
-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.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch64.bb
deleted file mode 100644
index aeed17fe8..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch64.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" 
-IMX_SRCREV_ABBREV = "c600d03"
-SRC_URI[sha256sum] = "82e1bb6304d2aac70c72b691239d1bb5f6738cadfa812d07196db2f580c63d29"
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
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
new file mode 100644
index 000000000..f0e7d285d
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch32.bb
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..38870add7
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch64.bb
@@ -0,0 +1,9 @@
+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/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
index e4fafeb0b..87f73440f 100644
--- a/recipes-graphics/mali/mali-imx.inc
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -45,6 +45,8 @@ FILES:${PN}-opencl-icd = " \
    ${sysconfdir}/OpenCL"
 FILES:${PN}-libvulkan = " \
    ${sysconfdir}/vulkan"
+RDEPENDS:${PN}-libvulkan = "vulkan-wsi-layer"
+RPROVIDES:${PN}-libvulkan = "virtual-vulkan-icd"
 FILES:${PN}-dev = " \
    ${bindir}/malisc"
diff --git a/recipes-graphics/mali/mali-imx_r53.0.bb b/recipes-graphics/mali/mali-imx_r54.0.bb
index 65b91f557..85ac6f8ca 100644
--- a/recipes-graphics/mali/mali-imx_r53.0.bb
+++ b/recipes-graphics/mali/mali-imx_r54.0.bb
@@ -1,13 +1,13 @@
 require mali-imx.inc
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[sha256sum] = "67a008bc64af4f3d9ad91465af3c0c3ac90ff8dcbcdaed96036eccc62880c7a3"
+SRC_URI[sha256sum] = "df89c80456c73ee8c235201b98c0b678d993083540912eab968dc0cbf683ad26"
-IMX_SRCREV_ABBREV = "f2226b0"
+IMX_SRCREV_ABBREV = "2943b3d"
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack
diff --git a/recipes-graphics/mesa/mesa.bbappend b/recipes-graphics/mesa/mesa.bbappend
index 120561d19..1c75c9884 100644
--- a/recipes-graphics/mesa/mesa.bbappend
+++ b/recipes-graphics/mesa/mesa.bbappend
@@ -1,10 +1,6 @@
 PROVIDES:remove:imxgpu   = "virtual/egl"
 PROVIDES:remove:imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2"
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:mx93-nxp-bsp = " file://0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch"
-SRC_URI:append:imx-nxp-bsp  = " file://0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch"
 PACKAGECONFIG:remove:imxgpu   = "egl gbm"
 PACKAGECONFIG:remove:imxgpu3d = "gles"
diff --git a/recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch b/recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch
deleted file mode 100644
index 3dc8db099..000000000
--- a/recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 612c3dc98d5d050b9cfee16ec77ca3c8358caa0d Mon Sep 17 00:00:00 2001
-From: Wujian Sun <wujian.sun_1@nxp.com>
-Date: Mon, 29 Apr 2024 17:29:16 +0800
-Subject: [PATCH] MGS-7599 cso: fix virgl driver assert issue
-A workaround that remove PIPE_MAX_SAMPLERS and
-PIPE_MAX_CONSTANT_BUFFERS assert.
-Upstream-Status: Inappropriate [i.MX-specific]
-Signed-off-by: Wujian Sun <wujian.sun_1@nxp.com>
---
- src/gallium/auxiliary/cso_cache/cso_context.c | 2 --
- src/gallium/drivers/virgl/virgl_screen.c      | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
-index 3e86def31c5..ffc6d22da9c 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
-+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
-@@ -403,10 +403,8 @@ cso_unbind_context(struct cso_context *ctx)
-                                               PIPE_SHADER_CAP_MAX_CONST_BUFFERS);
-             int maximg = scr->get_shader_param(scr, sh,
-                                               PIPE_SHADER_CAP_MAX_SHADER_IMAGES);
-            assert(maxsam <= PIPE_MAX_SAMPLERS);
-             assert(maxview <= PIPE_MAX_SHADER_SAMPLER_VIEWS);
-             assert(maxssbo <= PIPE_MAX_SHADER_BUFFERS);
-            assert(maxcb <= PIPE_MAX_CONSTANT_BUFFERS);
-             assert(maximg <= PIPE_MAX_SHADER_IMAGES);
-             if (maxsam > 0) {
-                ctx->base.pipe->bind_sampler_states(ctx->base.pipe, sh, 0, maxsam, zeros);
-diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
-index 389a1935cc3..7c7f8ba576b 100644
--- a/src/gallium/drivers/virgl/virgl_screen.c
-+++ b/src/gallium/drivers/virgl/virgl_screen.c
-@@ -435,7 +435,7 @@ virgl_get_shader_param(struct pipe_screen *screen,
-          return 1;
-       case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
-          return MIN2(vscreen->caps.caps.v2.max_shader_sampler_views,
-                     PIPE_MAX_SHADER_SAMPLER_VIEWS);
-+                     PIPE_MAX_SAMPLERS);
-       case PIPE_SHADER_CAP_INTEGERS:
-          return vscreen->caps.caps.v1.glsl_level >= 130;
-       case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
-- 
-2.17.1
diff --git a/recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch b/recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch
deleted file mode 100644
index 0cdcbfca6..000000000
--- a/recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 188d7b01037e5a0249e63c2600cf15a288a9ff3f Mon Sep 17 00:00:00 2001
-From: Wujian Sun <wujian.sun_1@nxp.com>
-Date: Fri, 19 Apr 2024 18:38:17 +0800
-Subject: [PATCH] MGS-7673 egl/dri2: fix video showing wrong frame
-Softpipe driver doesn't support EGL_EXT_image_dma_buf_import_modifiers
-extension.
-Should not report the extension.
-Upstream-Status: Pending
-Signed-off-by: Wujian Sun <wujian.sun_1@nxp.com>
---
- src/egl/drivers/dri2/egl_dri2.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
-index 992f0e3d46d..6ee209d4b47 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
-+++ b/src/egl/drivers/dri2/egl_dri2.c
-@@ -942,7 +942,8 @@ dri2_setup_screen(_EGLDisplay *disp)
- 
- #ifdef HAVE_LIBDRM
-       if (dri2_dpy->image->base.version >= 8 &&
-          dri2_dpy->image->createImageFromDmaBufs) {
-+          dri2_dpy->image->createImageFromDmaBufs &&
-+          strcmp("softpipe", pscreen->get_name(pscreen))) {
-          disp->Extensions.EXT_image_dma_buf_import = EGL_TRUE;
-          disp->Extensions.EXT_image_dma_buf_import_modifiers = EGL_TRUE;
-       }
-- 
-2.17.1
diff --git a/recipes-graphics/piglit/piglit/0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.patch b/recipes-graphics/piglit/piglit/0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.patch
new file mode 100644
index 000000000..3e673a497
--- /dev/null
+++ b/recipes-graphics/piglit/piglit/0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.patch
@@ -0,0 +1,30 @@
+From c14b65106687b1097f5d50a993707d8a2f99005b Mon Sep 17 00:00:00 2001
+From: jiajia Qian <jiajia.qian@nxp.com>
+Date: Tue, 19 Dec 2023 13:23:33 +0800
+Subject: [PATCH] tests: Fix cl test Include Directories: error : Error(0,8) :
+ Cannot find the header file include_test.h.
+Modified CMakeLists.txt to install include_test.h file in piglit/tests/cl/program/build/ folder.
+Modified the relative path in include-directories.cl from "tests/cl/program/build" to "../lib/piglit/tests/cl/program/build".
+Upstream-Status: Pending [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/853]
+Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
+---
+ CMakeLists.txt                                | 1 +
+ tests/cl/program/build/include-directories.cl | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Index: git/tests/cl/program/build/include-directories.cl
+===================================================================
+--- git.orig/tests/cl/program/build/include-directories.cl
+++ git/tests/cl/program/build/include-directories.cl
+@@ -2,7 +2,7 @@
+ [config]
+ name: Include Directories
+ clc_version_min: 10
+-build_options: -I . -I tests/cl/program/build
+build_options: -I . -I ../lib/piglit/tests/cl/program/build
+ !*/
+ 
+ #include "include_test.h"
diff --git a/recipes-graphics/piglit/piglit/0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch b/recipes-graphics/piglit/piglit/0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch
new file mode 100644
index 000000000..a4935b169
--- /dev/null
+++ b/recipes-graphics/piglit/piglit/0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch
@@ -0,0 +1,42 @@
+From 2673c2adc81a408a4238f786cb2d795a65308ce6 Mon Sep 17 00:00:00 2001
+From: Eric Guo <eric.guo@nxp.com>
+Date: Fri, 11 Apr 2025 17:15:40 +0800
+Subject: [PATCH] cl: Add mutually exclusive memory flags for
+ CL_MEM_KERNEL_READ_AND_WRITE
+Fix cl-api-create-buffer on mali DDK.
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1004]
+Signed-off-by: Eric Guo <eric.guo@nxp.com>
+---
+ tests/util/piglit-util-cl-enum.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+diff --git a/tests/util/piglit-util-cl-enum.c b/tests/util/piglit-util-cl-enum.c
+index 5d43bc102..f2c185c9c 100644
+--- a/tests/util/piglit-util-cl-enum.c
+++ b/tests/util/piglit-util-cl-enum.c
+@@ -979,7 +979,7 @@ PIGLIT_CL_DEFINE_ENUM_2(cl_command_queue_properties, 2, 2, 2, 4, 4 /* really? */
+ PIGLIT_CL_DEFINE_ENUM_PTR_2(cl_command_queue_properties);
+ 
+ 
+-PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 8, 8) = {
+PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 11, 11) = {
+        CL_MEM_READ_WRITE | CL_MEM_READ_ONLY,
+        CL_MEM_READ_WRITE | CL_MEM_WRITE_ONLY,
+        CL_MEM_READ_ONLY | CL_MEM_WRITE_ONLY,
+@@ -990,6 +990,11 @@ PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 8, 8) = {
+        CL_MEM_HOST_WRITE_ONLY | CL_MEM_HOST_NO_ACCESS,
+        CL_MEM_HOST_READ_ONLY | CL_MEM_HOST_NO_ACCESS,
+ #endif //CL_VERSION_1_2
+#if defined(CL_VERSION_2_0)
+       CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_READ_ONLY,
+       CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_WRITE_ONLY,
+       CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_READ_WRITE,
+#endif //CL_VERSION_2_0
+ };
+ PIGLIT_CL_DEFINE_ENUM_PTR(cl_mem_flags, cl_mem_flags_mutexes);
+ 
+-- 
+2.34.1
diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index fe2a0bc2f..3caf8aa15 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -1,6 +1,23 @@
-PACKAGECONFIG:remove:imxgpu = "glx"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG:append:mx8-nxp-bsp = " opencl"
+SRC_URI += "file://0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.patch \
-PACKAGECONFIG:append:mx9-nxp-bsp = " opencl"
+            file://0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch"
+PACKAGECONFIG:append = " ${PACKAGECONFIG_APPEND}"
+PACKAGECONFIG:remove = " ${PACKAGECONFIG_REMOVE}"
+PACKAGECONFIG_APPEND ?= " \
+    gbm \
+    opencl \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
+PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp  = ""
+PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp  = ""
+PACKAGECONFIG_REMOVE ?= ""
+PACKAGECONFIG_REMOVE:imxgpu              = "glx"
+PACKAGECONFIG_REMOVE:imxgpu:mx6-nxp-bsp  = "glx x11"
+PACKAGECONFIG_REMOVE:imxgpu:mx7-nxp-bsp  = "glx x11"
+PACKAGECONFIG[gbm] = "-DPIGLIT_USE_GBM=1,-DPIGLIT_USE_GBM=0,virtual/libgbm"
 CFLAGS:append:imxgpu:toolchain-clang = " -Wno-error=int-conversion"
diff --git a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader-1.3.275.0.imx/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
index da738aabe..da738aabe 100644
--- a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
+++ b/recipes-graphics/vulkan/vulkan-loader-1.3.275.0.imx/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
diff --git a/recipes-graphics/vulkan/vulkan-loader-1.4.328.1/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader-1.4.328.1/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
new file mode 100644
index 000000000..f54919cd9
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader-1.4.328.1/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -0,0 +1,49 @@
+From 91aff12a127428ff558d57d93b91b0b909321c35 Mon Sep 17 00:00:00 2001
+From: Yuan Tian <yuan.tian@nxp.com>
+Date: Sat, 27 Apr 2024 06:06:54 +0800
+Subject: [PATCH] LF-11869 change mali wsi layer activating order
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
+---
+ loader/loader.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+diff --git a/loader/loader.c b/loader/loader.c
+index 9064cd633..5b00870a4 100644
+--- a/loader/loader.c
+++ b/loader/loader.c
+@@ -3034,6 +3034,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+ #if !defined(_WIN32)
+     char temp_path[2048];
+ #endif
+    bool has_wsi_layer = false;
+ 
+     // Now, parse the paths
+     char *next_file = search_path;
+@@ -3100,6 +3101,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                 name = full_path;
+ 
+                 VkResult local_res;
+                if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) {
+                    has_wsi_layer = true;
+                    continue;
+                }
+                 local_res = add_if_manifest_file(inst, name, out_files);
+ 
+                 // Incomplete means this was not a valid data file.
+@@ -3110,6 +3115,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                     break;
+                 }
+             }
+
+            if(has_wsi_layer) {
+                name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json";
+                vk_result = add_if_manifest_file(inst, name, out_files);
+                has_wsi_layer = false;
+            }
+
+             loader_closedir(inst, dir_stream);
+             if (vk_result != VK_SUCCESS) {
+                 goto out;
diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
new file mode 100644
index 000000000..8f28ab1be
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
@@ -0,0 +1,10 @@
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
+"
+PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
+# libvulkan.so is loaded dynamically, so put it in the main package
+SOLIBS:imx-nxp-bsp          = ".so*"
+FILES_SOLIBSDEV:imx-nxp-bsp = ""
+INSANE_SKIP:${PN}:imx-nxp-bsp += "dev-so"
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
index f46249215..8cac41b53 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
@@ -1,14 +1 @@
-FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/vulkan-loader-1.3.275.0.imx:"
-SRC_URI:append:imx-nxp-bsp = " \
-    file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
-"
-# libvulkan.so is loaded dynamically, so put it in the main package
-SOLIBS          = ".so*"
-FILES_SOLIBSDEV = ""
-INSANE_SKIP:${PN} += "dev-so"
-# Override default mesa drivers with i.MX GPU drivers
-RRECOMMENDS:${PN}:imxviv  = "libvulkan-imx"
-RRECOMMENDS:${PN}:imxmali = "mali-imx-libvulkan"
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.4.328.1.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.4.328.1.bbappend
new file mode 100644
index 000000000..93f780c9c
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader_1.4.328.1.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/vulkan-loader-1.4.328.1:"
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer/0001-MGS-6801-ccc-vkmark-on-wayland.patch b/recipes-graphics/vulkan/vulkan-wsi-layer/0001-MGS-6801-ccc-vkmark-on-wayland.patch
new file mode 100644
index 000000000..48cfcd765
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer/0001-MGS-6801-ccc-vkmark-on-wayland.patch
@@ -0,0 +1,30 @@
+From ada74fb0ca3099f33d173eb664bd7e42025a3277 Mon Sep 17 00:00:00 2001
+From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
+Date: Mon, 9 Dec 2024 09:15:11 +0800
+Subject: [PATCH 1/2] MGS-6801 [#ccc] vkmark on wayland
+Extend the wayland surface properties with VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR
+Upstream-Status: Inappropriate [i.MX-specific]
+Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
+Signed-off-by: Jiyu Yang <jiyu.yang@nxp.com>
+---
+ wsi/wayland/surface_properties.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/wsi/wayland/surface_properties.cpp b/wsi/wayland/surface_properties.cpp
+index e6435b9..bc1a737 100644
+--- a/wsi/wayland/surface_properties.cpp
+++ b/wsi/wayland/surface_properties.cpp
+@@ -89,7 +89,7 @@ VkResult surface_properties::get_surface_capabilities(VkPhysicalDevice physical_
+ 
+    /* Composite alpha */
+    pSurfaceCapabilities->supportedCompositeAlpha = static_cast<VkCompositeAlphaFlagBitsKHR>(
+-      VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR | VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR);
+      VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR | VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR);
+    return VK_SUCCESS;
+ }
+ 
+-- 
+2.37.1
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer/0002-MGS-6823-nxp-Add-support-of-VK_COMPOSITE_ALPHA_OPAQU.patch b/recipes-graphics/vulkan/vulkan-wsi-layer/0002-MGS-6823-nxp-Add-support-of-VK_COMPOSITE_ALPHA_OPAQU.patch
new file mode 100644
index 000000000..9955f415e
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer/0002-MGS-6823-nxp-Add-support-of-VK_COMPOSITE_ALPHA_OPAQU.patch
@@ -0,0 +1,243 @@
+From 4293d8835eaa45168c070793eefd8867c6ec7605 Mon Sep 17 00:00:00 2001
+From: Yuan Tian <yuan.tian@nxp.com>
+Date: Thu, 27 Jul 2023 18:25:16 +0800
+Subject: [PATCH 2/2] MGS-6823 [#nxp] Add support of
+ VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR feature
+Mali vulkan driver doesn't support VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR. It caused unwanted blending effect in many vulkan cases.
+Add support of this feature to solve the problem.
+Upstream-Status: Inappropriate [i.MX-specific]
+Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
+Signed-off-by: Jiyu Yang <jiyu.yang@nxp.com>
+---
+ wsi/wayland/swapchain.cpp | 161 ++++++++++++++++++++++++++++++++++++++
+ wsi/wayland/swapchain.hpp |   9 +++
+ 2 files changed, 170 insertions(+)
+Index: git/wsi/wayland/swapchain.cpp
+===================================================================
+--- git.orig/wsi/wayland/swapchain.cpp
+++ git/wsi/wayland/swapchain.cpp
+@@ -38,6 +38,7 @@
+ #include <cstdio>
+ #include <climits>
+ #include <functional>
+#include <poll.h>
+ 
+ #include "util/drm/drm_utils.hpp"
+ #include "util/log.hpp"
+@@ -72,12 +73,152 @@ swapchain::~swapchain()
+       wsialloc_delete(m_wsi_allocator);
+    }
+    m_wsi_allocator = nullptr;
+   if (wlc.opaque_region)
+   {
+      wl_compositor_destroy(wlc.wl_compositor);
+      wl_registry_destroy(wlc.registry);
+      wl_region_destroy(wlc.opaque_region);
+      wlc = {0};
+   }
+    if (m_buffer_queue != nullptr)
+    {
+       wl_event_queue_destroy(m_buffer_queue);
+    }
+ }
+ 
+static inline int
+poll_event(struct wl_display *wl_dpy, short int events, int timeout)
+{
+   int ret;
+   struct pollfd pfd[1];
+
+   pfd[0].fd = wl_display_get_fd(wl_dpy);
+   pfd[0].events = events;
+
+   do
+   {
+      ret = poll(pfd, 1, timeout);
+   }
+   while (ret == -1 && errno == EINTR);
+
+   return ret;
+}
+
+static int
+dispatch_queue_op(struct wl_display *wl_dpy,
+                struct wl_event_queue *wl_queue, int timeout)
+{
+   int ret;
+
+   if (wl_display_prepare_read_queue(wl_dpy, wl_queue) == -1)
+   {
+      return wl_display_dispatch_queue_pending(wl_dpy, wl_queue);
+   }
+
+   for (;;)
+   {
+      ret = wl_display_flush(wl_dpy);
+
+      if (ret != -1 || errno != EAGAIN)
+         break;
+
+      if (poll_event(wl_dpy, POLLOUT, -1) == -1)
+      {
+         wl_display_cancel_read(wl_dpy);
+         return -1;
+      }
+   }
+
+   /* Don't stop if flushing hits an EPIPE; continue so we can read any
+    * protocol error that may have triggered it. */
+   if (ret < 0 && errno != EPIPE)
+   {
+      wl_display_cancel_read(wl_dpy);
+      return -1;
+   }
+
+   ret = poll_event(wl_dpy, POLLIN, timeout);
+
+   /* cancel read when on error or timeout. */
+   if (ret == -1 || ret == 0)
+   {
+      wl_display_cancel_read(wl_dpy);
+      return ret;
+   }
+
+   if (wl_display_read_events(wl_dpy) == -1)
+      return -1;
+
+   return wl_display_dispatch_queue_pending(wl_dpy, wl_queue);
+}
+
+static void
+sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
+{
+   int *done = (int *)data;
+
+   *done = 1;
+   wl_callback_destroy(callback);
+}
+
+static const struct wl_callback_listener sync_listener = {
+   sync_callback
+};
+
+static int
+roundtrip_queue(struct wl_display *wl_dpy, struct wl_event_queue *wl_queue)
+{
+   struct wl_callback *callback;
+   int done, ret = 0;
+
+   done = 0;
+
+   /*
+    * This is to block read & dispatch events in other threads, so that the
+    * callback is with correct queue and listener when 'done' event.
+    */
+   while (wl_display_prepare_read_queue(wl_dpy, wl_queue) == -1)
+      wl_display_dispatch_queue_pending(wl_dpy, wl_queue);
+
+   callback = wl_display_sync(wl_dpy);
+
+   if (callback == NULL)
+   {
+      wl_display_cancel_read(wl_dpy);
+      return -1;
+   }
+
+   wl_proxy_set_queue((struct wl_proxy *) callback, wl_queue);
+   wl_callback_add_listener(callback, &sync_listener, &done);
+
+   wl_display_cancel_read(wl_dpy);
+
+   while (!done && ret >= 0)
+      ret = dispatch_queue_op(wl_dpy, wl_queue, 5);
+
+   if (ret == -1 && !done)
+      wl_callback_destroy(callback);
+
+   return ret;
+}
+
+static void
+registry_handle_global(void *data, struct wl_registry *registry, uint32_t name,
+                       const char *interface, uint32_t version)
+{
+   wl_context *pwlc = (wl_context *)data;
+
+   if(!pwlc->wl_compositor)
+   {
+      pwlc->wl_compositor = (wl_compositor *)wl_registry_bind(registry, name, &wl_compositor_interface, 1);
+      wl_proxy_set_queue((struct wl_proxy *)pwlc->wl_compositor, pwlc->wl_queue);
+   }
+}
+
+static const struct wl_registry_listener registry_listener = {
+   registry_handle_global
+};
+
+ VkResult swapchain::init_platform(VkDevice device, const VkSwapchainCreateInfoKHR *swapchain_create_info,
+                                   bool &use_presentation_thread)
+ {
+@@ -124,6 +265,21 @@ VkResult swapchain::init_platform(VkDevi
+    use_presentation_thread =
+       WAYLAND_FIFO_PRESENTATION_THREAD_ENABLED && (m_present_mode != VK_PRESENT_MODE_MAILBOX_KHR);
+ 
+   if (swapchain_create_info->compositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)
+   {
+      wlc.wl_queue = m_buffer_queue;
+      wlc.registry = wl_display_get_registry(m_display);
+      wl_proxy_set_queue((struct wl_proxy *)(wlc.registry), m_buffer_queue);
+      wl_registry_add_listener(wlc.registry, &registry_listener, &wlc);
+
+      roundtrip_queue(m_display, m_buffer_queue);
+
+      wlc.opaque_region = wl_compositor_create_region(wlc.wl_compositor);
+      wl_proxy_set_queue((struct wl_proxy *)(wlc.opaque_region), m_buffer_queue);
+
+      wl_region_add(wlc.opaque_region, 0, 0, swapchain_create_info->imageExtent.width, swapchain_create_info->imageExtent.height);
+   }
+
+    return VK_SUCCESS;
+ }
+ 
+@@ -494,6 +650,11 @@ void swapchain::present_image(const pend
+       set_error_state(VK_ERROR_SURFACE_LOST_KHR);
+    }
+ 
+   if (wlc.opaque_region)
+   {
+      wl_surface_set_opaque_region(m_surface, wlc.opaque_region);
+   }
+
+    wl_surface_attach(m_surface, image_data->buffer, 0, 0);
+ 
+    auto present_sync_fd = image_data->present_fence.export_sync_fd();
+Index: git/wsi/wayland/swapchain.hpp
+===================================================================
+--- git.orig/wsi/wayland/swapchain.hpp
+++ git/wsi/wayland/swapchain.hpp
+@@ -78,6 +78,14 @@ struct image_creation_parameters
+    }
+ };
+ 
+struct wl_context
+{
+   struct wl_event_queue *wl_queue;
+   struct wl_compositor *wl_compositor;
+   struct wl_registry *registry;
+   struct wl_region *opaque_region;
+};
+
+ class swapchain : public wsi::swapchain_base
+ {
+ public:
+@@ -190,6 +198,7 @@ private:
+ 
+    struct wl_display *m_display;
+    struct wl_surface *m_surface;
+   struct wl_context wlc = {0};
+    /** Raw pointer to the WSI Surface that this swapchain was created from. The Vulkan specification ensures that the
+     * surface is valid until swapchain is destroyed. */
+    surface *m_wsi_surface;
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer/0003-Update-minimum-version-of-CMake.patch b/recipes-graphics/vulkan/vulkan-wsi-layer/0003-Update-minimum-version-of-CMake.patch
new file mode 100644
index 000000000..0bc00de02
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer/0003-Update-minimum-version-of-CMake.patch
@@ -0,0 +1,32 @@
+From 0c4ed8178a25135ced9df8c8a8909e2882bfe869 Mon Sep 17 00:00:00 2001
+From: Maged Elnaggar <maged.elnaggar@arm.com>
+Date: Tue, 17 Jun 2025 10:33:44 +0000
+Subject: [PATCH] Update minimum version of CMake
+Set CMake minimum required version range to 3.4.3...4.0
+to silence compatibility errors in CMake 4.0
+by explicitly opting into all policies up to 4.0
+Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/commit/1eafebc56a7f735cd4e8298956d596c64ac9f681]
+Signed-off-by: Maged Elnaggar <maged.elnaggar@arm.com>
+Change-Id: I2e0527dde4e764e9c17f519fc0ddd3c0e382fa31
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4dc800c..b91cd54 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ # SOFTWARE.
+ 
+-cmake_minimum_required(VERSION 3.4.3)
+cmake_minimum_required(VERSION 3.4.3...4.0)
+ project(VkLayer_window_system_integration)
+ 
+ find_package(PkgConfig REQUIRED)
+-- 
+2.34.1
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
new file mode 100644
index 000000000..efa6accb3
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Vulkan Window System Integration Layer"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c2e771b72d60a13d2de384cb49055d00"
+DEPENDS = "libdrm vulkan-loader"
+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"
+SRCREV = "cb1a50cf7e640ad7306e673131ded98c0f133628"
+inherit cmake pkgconfig
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'headless', d)}"
+PACKAGECONFIG[headless] = " \
+    -DBUILD_WSI_HEADLESS=1, \
+    -DBUILD_WSI_HEADLESS=0, \
+    ,,, \
+    wayland"
+PACKAGECONFIG[wayland] = " \
+    -DBUILD_WSI_WAYLAND=1 -DENABLE_WAYLAND_FIFO_PRESENTATION_THREAD=1 -DSELECT_EXTERNAL_ALLOCATOR=dma_buf_heaps, \
+    -DBUILD_WSI_WAYLAND=0, \
+    wayland wayland-native wayland-protocols,,, \
+    headless"
+EXTRA_OECMAKE = " \
+    -DBUILD_WSI_DISPLAY=0 \
+    -DBUILD_WSI_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN=1 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
+    -DENABLE_INSTRUMENTATION=1 \
+    -DKERNEL_HEADER_DIR=${KERNEL_HEADER_DIR} \
+    -DVULKAN_WSI_LAYER_EXPERIMENTAL=0 "
+# The KERNEL_HEADER_DIR setting is required by the CMake apparently
+# in order to find the DRM headers. However, the Yocto build provides
+# the DRM headers via a separate recipe libdrm in order to avoid the
+# kernel dependency. The CMake fails if the variable is not defined,
+# so set it to an invalid value in case the build ever actually needs
+# the kernel headers for something else.
+KERNEL_HEADER_DIR = "KERNEL_HEADER_DIR_NOT_PROVIDED_BY_YOCTO"
+do_install() {
+    install -d ${D}${sysconfdir}/vulkan/implicit_layer.d
+    install -m 0755 ${B}/libVkLayer_window_system_integration.so ${D}${sysconfdir}/vulkan/implicit_layer.d/
+    install -m 0644 ${B}/VkLayer_window_system_integration.json ${D}${sysconfdir}/vulkan/implicit_layer.d
+}
+# Adjust packaging variables for unversioned library
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
diff --git a/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.41.imx.bb
index 393278bc6..3350a4795 100644
--- a/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb
+++ b/recipes-graphics/wayland/wayland-protocols_1.41.imx.bb
@@ -11,12 +11,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \
 SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}"
 WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https"
-SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}"
+SRCBRANCH = "wayland-protocols-imx-1.41"
-SRCREV = "831a5389062e56dcb1aac4a5419e55e3002aafaf"
+SRCREV = "7213a4e09837c77112bce2d241491600e00dd095"
-S = "${WORKDIR}/git"
+UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags"
+UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)"
-UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
+DEPENDS += "wayland-native"
 # NOTE: For i.MX drop allarch since the recipe is SOCARCH
 #inherit meson pkgconfig allarch
@@ -24,9 +25,6 @@ inherit meson pkgconfig
 EXTRA_OEMESON += "-Dtests=false"
-PACKAGES = "${PN}"
-FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
 BBCLASSEXTEND = "native nativesdk"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index 2c74481ac..4d7d99130 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -68,7 +68,7 @@ PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
 # Weston on framebuffer
 PACKAGECONFIG[fbdev] = "-Ddeprecated-backend-fbdev=true,-Ddeprecated-backend-fbdev=false,udev mtdev"
 # Weston on RDP
-PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
+PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
 # weston-launch
 PACKAGECONFIG[launch] = "-Ddeprecated-weston-launch=true,-Ddeprecated-weston-launch=false,drm"
 # VA-API desktop recorder
@@ -144,7 +144,7 @@ RDEPENDS:${PN}-xwayland += "xwayland"
 RDEPENDS:${PN} += "xkeyboard-config"
 RRECOMMENDS:${PN} = "weston-init liberation-fonts"
-RRECOMMENDS:${PN}-dev += "wayland-protocols"
+RDEPENDS:${PN}-dev += "wayland-protocols-dev"
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "--system weston-launch"
@@ -166,7 +166,6 @@ SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.pat
            file://0001-g2d-renderer.c-Include-sys-stat.h.patch"
 SRCBRANCH = "weston-imx-10.0.5"
 SRCREV = "7129417ae04de57f9596ccf27f74ef967660a64f"
-S = "${WORKDIR}/git"
 # Disable OpenGL for parts with GPU support for 2D but not 3D
 REQUIRED_DISTRO_FEATURES          = "opengl"
@@ -206,6 +205,6 @@ EXTRA_OEMESON += "-Ddeprecated-wl-shell=true"
 LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
 ########### End of i.MX overrides #########
diff --git a/recipes-graphics/wayland/weston_14.0.1.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index f66974700..c4f938e5a 100644
--- a/recipes-graphics/wayland/weston_14.0.1.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -3,7 +3,7 @@
 # recipe. The second section customizes the recipe for i.MX.
 ########### OE-core copy ##################
-# Upstream hash: 23271a1f908a223b4eb56d6034cbb1ac23da14fe
+# Upstream hash: 8996690a79ac42a1dee6d041eeb1c1fe29fdac84
 SUMMARY = "Weston, a Wayland compositor"
 DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
@@ -14,14 +14,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
                    "
 SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
-           file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \
           file://weston.png \
           file://weston.desktop \
           file://xwayland.weston-start \
           file://systemd-notify.weston-start \
           "
-SRC_URI[sha256sum] = "27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093"
+SRC_URI[sha256sum] = "a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3"
 UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
 UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
@@ -33,13 +32,13 @@ inherit meson pkgconfig useradd
 require ${THISDIR}/required-distro-features.inc
 DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
-DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
+DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native libdisplay-info"
 LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
 WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
-EXTRA_OEMESON += "-Dpipewire=false"
+EXTRA_OEMESON += "-Dpipewire=false -Dtests=false"
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
@@ -80,9 +79,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
 # Weston with systemd support
 PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus"
 # Weston with Xwayland support (requires X11 and Wayland)
-PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland"
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland"
-# colord CMS support
-PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
 # Clients support
 PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
 # Virtual remote output with GStreamer on DRM backend
@@ -147,7 +144,7 @@ RDEPENDS:${PN}-xwayland += "xwayland"
 RDEPENDS:${PN} += "xkeyboard-config"
 RRECOMMENDS:${PN} = "weston-init liberation-fonts"
-RRECOMMENDS:${PN}-dev += "wayland-protocols"
+RDEPENDS:${PN}-dev += "wayland-protocols-dev"
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "--system weston-launch"
@@ -162,27 +159,20 @@ LIC_FILES_CHKSUM +=       "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
 DEFAULT_PREFERENCE = "-1"
-DEPENDS:append = " libdisplay-info"
 SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz"
 SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
 WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
-SRCBRANCH = "weston-imx-14.0.1"
+SRCBRANCH = "weston-imx-14.0.2"
-SRCREV = "0fd5d3ab75346e525b565039a7b8bf5d9008be78"
+SRCREV = "c267ba8e6eed3a824e042a200bcc1b4c370ba88f"
-S = "${WORKDIR}/git"
-SRC_URI:remove = "file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch"
-PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
 PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
+PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
-PACKAGECONFIG_G2D              ??= ""
+PACKAGECONFIG_G2D               ??= ""
-PACKAGECONFIG_G2D:imxgpu2d     ??= "imxg2d"
+PACKAGECONFIG_G2D:imxgpu2d      ??= "imxg2d"
-PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
+PACKAGECONFIG_G2D:mx93-nxp-bsp  ??= "imxg2d"
+PACKAGECONFIG_G2D:mx943-nxp-bsp ??= "imxg2d"
-# Remove no longer supported colord
-PACKAGECONFIG[colord] = ""
 # 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.bb b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
index 36d5cb727..1d7ee80f6 100644
--- a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
+++ b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
@@ -18,7 +18,7 @@ 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 = "${WORKDIR}/${BP_ORIGINAL}"
+S = "${UNPACKDIR}/${BP_ORIGINAL}"
 UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 9ed3f1f5f..947a31280 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -9,8 +9,6 @@ SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \
 "
 DEPENDS = "iproute2"
-S = "${WORKDIR}/git"
 export IPROUTE2_DIR = "${STAGING_DIR_TARGET}"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export CROSS_COMPILE = "${WRAP_TARGET_PREFIX}"
diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index 553e2013c..054cb1fb9 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -7,8 +7,6 @@ inherit module
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/auto-resp;branch=nxp/sdk-v2.0.x;protocol=https"
 SRCREV =  "9a74743167dcfcfbca5056eedbff9a52337c9712"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
 export KERNEL_PATH
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
index 13793132a..053239365 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
@@ -12,8 +12,6 @@ PV .= "+git${SRCPV}"
 SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c"
 SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 inherit module
 KERNEL_MODULE_AUTOLOAD = "galcore"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb
index 8a0c0bbeb..8670443db 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2016 Freescale Semiconductor
-# Copyright (C) 2017-2024 NXP
+# Copyright (C) 2017-2025 NXP
 SUMMARY = "Kernel loadable module for Vivante GPU"
 DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
@@ -7,14 +7,14 @@ 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 = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \
+SRC_URI = "${LINUX_IMX_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${S}/src \
           file://Add-makefile.patch"
-KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.3-1.0.0"
+LOCALVERSION = "-6.12.20-2.0.0"
-SRCREV = "d8c9f00d41b313a1ac122530524a62604c6871c9"
+SRCREV = "d53b3fa8a69bef5ead825e81aa62dbdd08e1409c"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 inherit module
diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
index d2316fe00..50d8cca62 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
@@ -8,8 +8,6 @@ inherit module qoriq_build_64bit_kernel
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;protocol=https;nobranch=1"
 SRCREV = "74d662707558290f070f9589177db730444bc435"
-S = "${WORKDIR}/git"
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 do_compile:prepend () {
    cd ${S}/kernel
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb
index 33c348ae9..058d9e0d8 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2023 NXP
+# Copyright (C) 2020-2025 NXP
 DESCRIPTION = "Kernel loadable module for ISP"
 LICENSE = "GPL-2.0-only"
@@ -6,17 +6,18 @@ LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
 SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
 ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
-SRCBRANCH = "lf-6.12.y_1.0.0"
+SRCBRANCH = "lf-6.12.y_2.0.0"
-SRCREV = "78d717bb22819df9d988ef1b4e3cca1acf61095d"
+SRCREV = "dc686fbb8b5b2f4cbc58d83756f65ad970b03ac2"
-S = "${WORKDIR}/git/vvcam/v4l2"
+S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
 inherit module
 MODULES_MODULE_SYMVERS_LOCATION = "dwe"
 DEBUG_PREFIX_MAP:prepend = " \
-    -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+    -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
-    -fdebug-prefix-map=${WORKDIR}/git/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-ls-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
index ba1561618..9c5ce8f17 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
@@ -10,8 +10,6 @@ inherit module autotools-brokensep
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ls-dbg;branch=nxp/master;protocol=https"
 SRCREV = "40501f6659e880d38508cdd34a4df2d348d1c68e"
-S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
 EXTRA_OEMAKE += 'SYSROOT="${D}"'
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 5b3b47756..2341ab0c9 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -8,15 +8,13 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
 MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = " \
    ${MRVL_SRC};branch=${SRCBRANCH} \
    file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
 "
-SRCREV = "0396cfb38ad73a3d587cd0f8c139b47801e70891"
+SRCREV = "7a8beaa1605cb0870dc7ba3312c76df91cb0d6cf"
-S = "${WORKDIR}/git"
 inherit module
diff --git a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
index efccc286d..e7ae8556e 100644
--- a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
@@ -7,6 +7,6 @@ SRCREV = "0f31fbcbe9ab1ab9c424da34f70c82314b16f8de"
 inherit module
-S = "${WORKDIR}/git/uio-driver"
+S = "${UNPACKDIR}/${BP}/uio-driver"
 COMPATIBLE_MACHINE = "(t1040|t1042)"
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.12.bb b/recipes-kernel/linux/linux-fslc-imx_6.12.bb
index 8d680ff0c..b3b0f190f 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.12.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.12.bb
@@ -42,21 +42,22 @@ 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.3.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y
+# $ git log --oneline  --no-merges v6.12.49.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y
-# - 29efe53139ac hwrng: optee: support generic crypto
+# - bacd5504126bb imx8mp-olimex.dts: CSI GPIO pins
-# - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states
+# - 3a7012e991c98 hwrng: optee: support generic crypto
-# - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST
+# - 6c0a3377748eb arm64: dts: imx8mq: drop cpu-idle-states
-# - 1bd794e571f6 gpu: drm: cadence: select hdmi helper
+# - 7db0692d9ff5e of: enable using OF_DYNAMIC without OF_UNITTEST
-# - d74361dc9bdc imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error
+# - eff98b934385c gpu: drm: cadence: select hdmi helper
-# - 90900e871607 arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
+# - be5e175e43d93 imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error
-# - 24ef2924dd5f drm: of: Fix build without CONFIG_OF
+# - 76e18f5a57b3e arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
-# - a97fe216ede5 i2c: imx: Remove unnecessary clock reconfiguration
+# - 06b99391f850c drm: of: Fix build without CONFIG_OF
-# - 93e7f87e7bc6 drm/imx: lcdifv3: Fix videomode settings
+# - 17ac89e381a9d i2c: imx: Remove unnecessary clock reconfiguration
-# - ff2397021b0d clk: imx: imx8qm: add more resources to whitelist
+# - 6d157e81ccc53 drm/imx: lcdifv3: Fix videomode settings
-# - e0fc64f7a2f8 arm64: dts: imx8: img: add #address-cells and #size-cells to I2C MIPI CSI nodes
+# - 0a355239e2df3 clk: imx: imx8qm: add more resources to whitelist
-# - 98b777bfa849 arm64: dts: imx8qm: add missing imx8-ss-cm40.dtsi include
+# - c5c4869899b1c arm64: dts: imx8: img: add #address-cells and #size-cells to I2C MIPI CSI nodes
-# - 2d0aefc287a7 arm64: imx_v8_defconfig: Enable CONFIG_GPIO_VF610
+# - 3159e7d086295 arm64: dts: imx8qm: add missing imx8-ss-cm40.dtsi include
-# - 44aadbd00c61 imx8mp-olimex.dts: Olimex iMX8MP-SOM-EVB-IND
+# - 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
@@ -66,16 +67,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 require linux-imx.inc
-KBRANCH = "6.12-1.0.x-imx"
+KBRANCH = "6.12-2.0.x-imx"
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-SRCREV = "29efe53139acb64d96bfcc119cd10d10c552801b"
+SRCREV = "77b58422ab0fa4480a0b89a5f1ebfb9d1a900aef"
 # 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.3"
+LINUX_VERSION = "6.12.49"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
index 8e1bab4be..ae1e71b18 100644
--- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
@@ -21,10 +21,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.1.72"
+LINUX_VERSION = "6.1.111"
 KBRANCH = "6.1.x+fslc"
-SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24"
+SRCREV = "195925841506cd58552d73ebabadd08d6016e4c6"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.6.bb b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
index a8c91cdb8..cc067262a 100644
--- a/recipes-kernel/linux/linux-fslc-lts_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.6.50"
+LINUX_VERSION = "6.6.52"
 KBRANCH = "6.6.x+fslc"
-SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699"
+SRCREV = "3768fbd9dd8e0da9e7a24366b6a65a7f8ca25986"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc_6.12.bb b/recipes-kernel/linux/linux-fslc_6.12.bb
index 7902b7536..8b66b82d4 100644
--- a/recipes-kernel/linux/linux-fslc_6.12.bb
+++ b/recipes-kernel/linux/linux-fslc_6.12.bb
@@ -24,12 +24,12 @@ DEPENDS += " \
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
 #
-# Linux kernel stable 6.12.28 changelog:
+# Linux kernel stable 6.12.34 changelog:
-# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.28
+# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34
-LINUX_VERSION = "6.12.28"
+LINUX_VERSION = "6.12.34"
 KBRANCH = "6.12.x+fslc"
-SRCREV = "7a7717289cd3915e484b02c02557de380352b030"
+SRCREV = "e92f5b7050c74e8052f071fd2f1d233d9a4b2f30"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-imx-headers_6.12.bb b/recipes-kernel/linux/linux-imx-headers_6.12.bb
index c8a2a3450..ed2478965 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.12.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.12.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 NXP
+# Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 SUMMARY = "Installs i.MX-specific kernel headers"
@@ -13,9 +13,7 @@ SRC_URI = " \
 "
 SRCBRANCH = "lf-6.12.y"
 LOCALVERSION = "-lts-${SRCBRANCH}"
-SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
+SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
-S = "${WORKDIR}/git"
 do_configure[noexec] = "1"
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 4e3911168..521bd7948 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -19,8 +19,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH}"
-S = "${WORKDIR}/git"
 # Tell to kernel class that we would like to use our defconfig to configure the kernel.
 # Otherwise, the --allnoconfig would be used per default which leads to mis-configured
 # kernel.
diff --git a/recipes-kernel/linux/linux-imx_6.12.bb b/recipes-kernel/linux/linux-imx_6.12.bb
index 05d9c4ea6..267a33542 100644
--- a/recipes-kernel/linux/linux-imx_6.12.bb
+++ b/recipes-kernel/linux/linux-imx_6.12.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 (C) Freescale Semiconductor
-# Copyright 2017-2024 (C) NXP
+# Copyright 2017-2025 (C) NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
@@ -13,15 +13,15 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
 require recipes-kernel/linux/linux-imx.inc
 SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.3-1.1.0"
+LOCALVERSION = "-6.12.20-2.0.0"
-SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
+SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
 # 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.3"
+LINUX_VERSION = "6.12.20"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 5d28ae84a..09de1ba0a 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -1,15 +1,13 @@
 inherit kernel qoriq_build_64bit_kernel siteinfo
-inherit fsl-kernel-localversion
+inherit fsl-kernel-localversion kernel-yocto
 SUMMARY = "Linux Kernel for NXP QorIQ platforms"
 SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
-S = "${WORKDIR}/git"
+DEPENDS:append = " libgcc coreutils-native"
-DEPENDS:append = " libgcc"
 # not put Images into /boot of rootfs, install kernel-image if needed
-RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}"
@@ -23,12 +21,16 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SCMVERSION ?= "y"
 LOCALVERSION = ""
 DELTA_KERNEL_DEFCONFIG ?= ""
 DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm64 = "lsdk.config "
 DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm = "multi_v7_lpae.config lsdk.config "
-do_merge_delta_config[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot bison-native:do_populate_sysroot"
+do_merge_delta_config[depends] += "virtual/cross-cc:do_populate_sysroot bison-native:do_populate_sysroot"
 do_merge_delta_config[dirs] = "${B}"
+do_kernel_metadata[noexec] = "1"
+do_kernel_configme[noexec] = "1"
+do_kernel_configcheck[noexec] = "1"
 do_merge_delta_config() {
    # create config with make config
@@ -44,15 +46,17 @@ do_merge_delta_config() {
    for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
        if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then
            oe_runmake  -C ${S} O=${B} ${deltacfg}
-        elif [ -f "${WORKDIR}/${deltacfg}" ]; then
+        elif [ -f "${S}/${deltacfg}" ]; then
-            ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
+            ${S}/scripts/kconfig/merge_config.sh -m .config ${S}/${deltacfg}
        elif [ -f "${deltacfg}" ]; then
            ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
        fi
    done
-    cp .config ${WORKDIR}/defconfig
+    cp .config ${UNPACKDIR}/defconfig
 }
 addtask merge_delta_config before do_kernel_localversion after do_patch
 FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*"
+INSANE_SKIP:${PN}-src += " buildpaths"
 COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-kernel/linux/linux-qoriq_5.10.bb b/recipes-kernel/linux/linux-qoriq_5.10.bb
deleted file mode 100644
index c62de58e7..000000000
--- a/recipes-kernel/linux/linux-qoriq_5.10.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION = "5.10.52"
-SRC_URI = "git://github.com/nxp-qoriq/linux;protocol=https;nobranch=1"
-SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd"
-require recipes-kernel/linux/linux-qoriq.inc
diff --git a/recipes-kernel/linux/linux-qoriq_6.12.bb b/recipes-kernel/linux/linux-qoriq_6.12.bb
new file mode 100644
index 000000000..b43fe7d53
--- /dev/null
+++ b/recipes-kernel/linux/linux-qoriq_6.12.bb
@@ -0,0 +1,9 @@
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+LINUX_VERSION = "6.12.20"
+LINUX_QORIQ_BRANCH ?= "lf-6.12.y"
+LINUX_QORIQ_SRC ?= "git://github.com/nxp-qoriq/linux.git;protocol=https"
+SRC_URI = "${LINUX_QORIQ_SRC};branch=${LINUX_QORIQ_BRANCH}"
+SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
+require linux-qoriq.inc
diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
index af8982b9c..cc226bd9a 100644
--- a/recipes-kernel/skmm-host/skmm-host_git.bb
+++ b/recipes-kernel/skmm-host/skmm-host_git.bb
@@ -8,8 +8,6 @@ inherit  module qoriq_build_64bit_kernel
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-host;protocol=https;nobranch=1"
 SRCREV = "d5912ebdb8d3b29b1e2df52710e8821d1ce3eb80"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
 FILES:${PN} += "/etc/skmm/ /usr/bin/"
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 e77bcf85d..ae762cb9a 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
@@ -13,8 +13,6 @@ ETHOS_U_SRC ?= "git://github.com/nxp-imx/ethos-u-driver-stack-imx.git;protocol=h
 SRCBRANCH = "lf-6.12.3_1.0.0"
 SRCREV = "a80c51d77c91f1a8266afc5d8056fb981de4b504"
-S = "${WORKDIR}/git"
 inherit cmake setuptools3
 SETUPTOOLS_BUILD_ARGS = "build_ext --library-dirs ${B}/driver_library"
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 10afa6170..1f16dce90 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
@@ -12,8 +12,6 @@ ETHOS_U_FIRMWARE_SRC ?= "git://github.com/nxp-imx/ethos-u-firmware.git;protocol=
 SRCBRANCH = "lf-6.12.3_1.0.0"
 SRCREV = "3dbedc11bd2a4ba56af9fbe9d285b5bf13f1a088"
-S = "${WORKDIR}/git"
 ETHOS_U_FIRMWARE = "ethosu_firmware"
 ETHOS_U_FIRMWARE:imx93-9x9-lpddr4-qsb    = "ethosu_firmware_9x9"
 ETHOS_U_FIRMWARE:imx93-11x11-lpddr4x-evk = "ethosu_firmware_11x11"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index 7ad815b16..d38e97e8f 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-2024 NXP
+# Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale alsa-lib plugins"
@@ -20,10 +20,8 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "eaf0900662d6381bcc433165219280cca1752890"
+SRCREV = "40e45c8023f95c06c4ea10185ca85db7eb2dfcd8"
-S = "${WORKDIR}/git"
 CFLAGS:append = " -I${STAGING_INCDIR_IMX}"
diff --git a/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
index c0e458135..b596f2ef9 100644
--- a/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
+++ b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
@@ -1,4 +1,4 @@
-From 73b1002eda17451db1f58431b42c25203f1d3097 Mon Sep 17 00:00:00 2001
+From 67809420230cd4fcc63069f78efdc90c7b4c4ee1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 9 Sep 2018 17:38:10 -0700
 Subject: [PATCH] connect has a different signature on musl
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb
index 9f7f890d5..9a619f5a0 100644
--- a/recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb
@@ -6,13 +6,13 @@ SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-S = "${WORKDIR}/gst-devtools-1.22.5"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${@get_gst_ver("${PV}")}.tar.xz \
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.5.tar.xz \
           file://0001-connect-has-a-different-signature-on-musl.patch \
           "
-SRC_URI[sha256sum] = "2add1519aa6eeb01d544cb94293688ee3bc2079f6bca6075bf5c23d00a0921be"
+S = "${UNPACKDIR}/gst-devtools-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "eff33d7dc292bb074a2788ea887b6283398ffdefafa49fb7d08efe6658a65648"
 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS:${PN} = "git"
@@ -40,6 +40,9 @@ 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 \
diff --git a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
index 3830846b3..9db0051a1 100644
--- a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
@@ -17,7 +17,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;b
 SRCREV = "0f1e984e41ce8d6d0758265d35e8b10d5815fde2"
-S = "${WORKDIR}/git/subprojects/gst-examples"
+S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
 inherit meson pkgconfig features_check
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch
deleted file mode 100644
index 0a06540fb..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001
-From: "U. Artie Eoff" <ullysses.a.eoff@intel.com>
-Date: Mon, 13 Feb 2023 17:02:01 -0500
-Subject: [PATCH] avviddec: change
- AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS
-This fixes a compile error with recent upstream FFmpeg.
-The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to
-AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit
-7d09579190de (lavc 58.132.100).
-The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream
-commit 10c9a0874cb3 (lavc 59.63.100).
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3964>
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cde31d23c071ee93fae96331805f696856084254?merge_request_iid=3964]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
- ext/libav/gstavviddec.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index 43cea456ae8..6d7c4cd0de8 100644
--- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -35,6 +35,10 @@
- 
- GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100)
-+#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS
-+#endif
-+
- #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15)
- 
- #define MAX_TS_MASK 0xff
-@@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
-   if (ffmpegdec->max_threads == 0) {
-     /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal
-      * to one frame per thread. We thus need to calculate the thread count ourselves */
-    if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) ||
-+    if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) ||
-         (ffmpegdec->context->thread_type & FF_THREAD_FRAME))
-       ffmpegdec->context->thread_count =
-           MIN (gst_ffmpeg_auto_max_threads (), 16);
-- 
-GitLab
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb
index accca06ab..138398d85 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb
@@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                    "
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz"
-SRC_URI[sha256sum] = "c3e4179ba183c2d3101edf87ff70dd07e728c766a5fee34e6ecded76ca5802df"
+SRC_URI[sha256sum] = "707a8b687ff5fddcee5b02415e2ec9b71b4ac44d0b7aec3b477364ceecbf1ecf"
-S = "${WORKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb
index 7f5cd0b3d..1c4ee72d0 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb
@@ -187,10 +187,10 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug
                   "
 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.09.03_2412_L6.12.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "7bb1254fcb0a0dcb1ecb4ac21efbc5068151943d"
+SRCREV = "4320364e6be53cae81ac2bca3ce0e09cf8707590"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 inherit use-imx-headers
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb
index 6859d26b5..5c2492638 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb
@@ -118,10 +118,10 @@ SRC_URI:remove = " \
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "858ae5a1fb2bd2692ca7ebbd5bde2eee14e1842d"
+SRCREV = "bbe6aa6f5b666fda0b172c3e1f417c7eadb16549"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 inherit use-imx-headers
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend
index 528d7e1a3..528d7e1a3 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb
index 933adb5ef..7c921d97c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb
@@ -111,10 +111,10 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu
 SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "626a972e9ef448f1017cfad07a3486a0fb340a0d"
+SRCREV = "6a0df1aee0ef2477dbacedd79df08c5bcb648e55"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
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 f09a5bc77..cc2cedfd5 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
@@ -18,8 +18,6 @@ SRCBRANCH ?= "master"
 SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387"
 SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
 inherit pkgconfig meson use-imx-headers
 # libg2d on i.MX8 SoCs with a DPU is emulated via the DPU.
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb
index 55bb975b4..1f5956ab4 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb
@@ -14,9 +14,9 @@ LICENSE_FLAGS = "commercial"
 SRC_URI = " \
            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \
            "
-SRC_URI[sha256sum] = "c5d1cbdf71ab0c675bca236f70edfa1feb3f813fd4bfff563308f466d8805ca5"
+SRC_URI[sha256sum] = "a86b51c8454a813120848c803421f327d8c07aabcae461e0597cc49398c0fcde"
-S = "${WORKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
+S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
 DEPENDS += "gstreamer1.0-plugins-base"
@@ -43,6 +43,7 @@ EXTRA_OEMESON += " \
 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.0.imx.bbappend
new file mode 100644
index 000000000..ea144b396
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:remove = "a52dec mpeg2dec"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch
deleted file mode 100644
index fd6b1c16e..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8d7e2eaed10e2928358805f613223a6a149790d6 Mon Sep 17 00:00:00 2001
-From: Hiago De Franco <hiago.franco@toradex.com>
-Date: Wed, 31 Jul 2024 11:51:06 -0300
-Subject: [PATCH] meson.build: Fix missing python_opt
-'python_opt' was not declared earlier, giving the following build error:
-| Message: python_abi_flags =
-|
-| ../gst-python-1.24.0/meson.build:84:16: ERROR: Unknown variable "python_opt".
-Remove it and keep the error message.
-Upstream-Status: Inappropriate [oe specific]
-The patch already exists upstream, but this is related to another fix [1]
-not suitable for OE. Moreover, the backport does not apply since
-the patch was added to the gstreamer monorepo.
-[1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6734?
-Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
---
- meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-diff --git a/meson.build b/meson.build
-index f240b6fd8aca..53f7a43702c7 100644
--- a/meson.build
-+++ b/meson.build
-@@ -80,12 +80,7 @@ foreach loc: pylib_locs
-   endforeach
- endforeach
- if pylib_fname == ''
-  error_msg = 'Could not find python library to load'
-  if python_opt.enabled()
-    error(error_msg)
-  else
-    message(error_msg)
-  endif
-+  message('Could not find python library to load')
- endif
- 
- pygi_override_dir = get_option('pygi-overrides-dir')
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb
index 0ba9a1aea..388ee81e6 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb
@@ -7,18 +7,17 @@ SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
-SRC_URI = "\
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
-    https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz \
+SRC_URI[sha256sum] = "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db"
-    file://0001-meson.build-Fix-missing-python_opt.patch \
-    "
-SRC_URI[sha256sum] = "041c2255c1ea9936c777dcb08a36ecaa6a24a69a12fc46ef53f1530d46c59f9d"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
+DEPENDS:append = " gstreamer1.0-plugins-bad"
 RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 PNREAL = "gst-python"
-S = "${WORKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
 EXTRA_OEMESON += "\
    -Dtests=disabled \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb
index c866d2332..b5dd9a322 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb
@@ -10,9 +10,9 @@ PNREAL = "gst-rtsp-server"
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
-SRC_URI[sha256sum] = "5b0fa6b12ba95b1d336a4b274cbe19e982aa3e6819f1d97bfd8e0102b103ed9b"
+SRC_URI[sha256sum] = "e983c039496e3f75e39696554ce74db4120e2465de17aa1cc37160568e9b40bc"
-S = "${WORKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb
index dde7b5b1d..1d83ca031 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb
@@ -9,11 +9,11 @@ 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}-1.24.0.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${@get_gst_ver("${PV}")}.tar.xz"
-SRC_URI[sha256sum] = "6b1f3b91ca65dedc67dc67a25dc1d1e464f11825a27ab9c7ac7c1bda67f03596"
+SRC_URI[sha256sum] = "573931d455f5a96f63db7c8d35d51322b8d287816e8c6a77d84cfbb9fa1351f1"
-S = "${WORKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 inherit meson pkgconfig features_check upstream-version-is-even
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb
index 8daeed667..5b315ed7f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb
@@ -87,7 +87,7 @@ PTEST_BUILD_HOST_FILES = ""
 DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \
+    file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \
 "
@@ -100,10 +100,10 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV
 "
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "e0d37a7d773a502956f54eced8cd701ec7fa5ff5"
+SRCREV = "dba94b66ed28cc6537608a68c31c8be52f6f53a5"
-S = "${WORKDIR}/git"
+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
new file mode 100644
index 000000000..cb314b38d
--- /dev/null
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch
@@ -0,0 +1,35 @@
+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 a96b5b31a..2ba8fdd1d 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -27,22 +27,21 @@ DEPENDS_IMXGPU:imxgpu = "${DEPENDS_IMX_OPENCL_CONVERTER}"
 DEPENDS_IMX_OPENCL_CONVERTER               = "imx-opencl-converter"
 DEPENDS_IMX_OPENCL_CONVERTER:mx6-nxp-bsp   = ""
 DEPENDS_IMX_OPENCL_CONVERTER:mx7-nxp-bsp   = ""
-DEPENDS_IMX_OPENCL_CONVERTER:mx8-nxp-bsp   = "imx-opencl-converter"
 DEPENDS_IMX_OPENCL_CONVERTER:mx8mm-nxp-bsp = ""
-DEPENDS_IMX_OPENCL_CONVERTER:mx95-nxp-bsp   = "imx-opencl-converter"
 # For backwards compatibility
 RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
-PV = "4.9.3+git${SRCPV}"
+PV = "4.10.0+git${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = " \
-SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+    git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
-SRCREV = "370510ef8137874339df18a2a35ec1d04d98fa0b"
+    file://0001-gplay2-fix-termio.h-no-longer-existing.patch \
+"
-S = "${WORKDIR}/git"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRCREV = "6861aec99901375f5ebcd5170ce1f5232cd38fd6"
 inherit meson pkgconfig use-imx-headers
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb b/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb
index b435dacd1..6a5c2c32c 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb
@@ -1,23 +1,23 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2017-2024 NXP
+# Copyright (C) 2017-2025 NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia codec libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 # Backward compatibility
 PROVIDES += "libfslcodec"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[sha256sum] = "61b40623e1c2322f1ba85da57ab6949f749d02b3b5cbc2b1ef583a99b59e8968"
+SRC_URI[sha256sum] = "82242219e0d3536aeff31d9c215543bfe5541540bdb4fa8d61e83067b015e31f"
-IMX_SRCREV_ABBREV = "394336b"
+IMX_SRCREV_ABBREV = "464e9d8"
 inherit fsl-eula-unpack autotools pkgconfig
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 PACKAGECONFIG ??= "${PACKAGECONFIG_VPU}"
 # Support Chips&Media VPU only
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
index 4e42110b5..96656f85b 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
@@ -9,7 +9,7 @@ inherit fsl-eula-unpack autotools pkgconfig
 IMX_SRCREV_ABBREV = "ea4fe3f"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 SRC_URI[sha256sum] = "fc6e6a7c2417730b39eeddc26606c3d58a8f5d0a1521f44bbbd505657046858b"
diff --git a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb
deleted file mode 100644
index 9655b1f7d..000000000
--- a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019 NXP
-DESCRIPTION = "NXP Asynchronous Sample Rate Converter"
-LICENSE = "Proprietary"
-SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=72c0f70181bb6e83eee6aab8de12a9f3"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[sha256sum] = "e79cbf4788a86a0068bbe80c37317e3332ae76e3d5c3ff2eabd71f03121fab6a"
-inherit fsl-eula-unpack autotools pkgconfig
-EXTRA_OECONF = "--enable-armv8 --libdir=${libdir} --bindir=/unit_tests"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-FILES:${PN} += "/unit_tests ${datadir}/imx-mm"
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb
new file mode 100644
index 000000000..9cf4fa968
--- /dev/null
+++ b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb
@@ -0,0 +1,25 @@
+# Copyright 2019, 2025 NXP
+DESCRIPTION = "NXP Asynchronous Sample Rate Converter"
+LICENSE = "Proprietary"
+SECTION = "multimedia"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "ce4ae5a"
+SRC_URI[sha256sum] = "6382e46e5c60c844fc6a7a05876e19eed690c587300337624c66fa9cb20a3b7c"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack autotools pkgconfig
+EXTRA_OECONF = "--enable-armv8 --libdir=${libdir} --bindir=/unit_tests"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+FILES:${PN} += "/unit_tests ${datadir}/imx-mm"
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb
index 07ea662cc..cf4e4d182 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb
@@ -1,16 +1,16 @@
-# Copyright 2023-2024 NXP
+# Copyright 2023-2025 NXP
 DESCRIPTION = "NXP Multimedia opencl converter lib"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-DEPENDS = "virtual/opencl-icd"
+DEPENDS = "virtual/libopencl1"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "ad0094a"
+IMX_SRCREV_ABBREV = "b81b785"
-SRC_URI[sha256sum] = "d23ad4234f34ffcfb37d77c91345b935894937913a68995223d2f9f421eade46"
+SRC_URI[sha256sum] = "a4dee08d5949d41cb9c61d44ce0b5a055b9416129216f9d36d0bc6d9e512ab64"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack autotools pkgconfig meson
 FILES:${PN} += "${datadir}/"
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb b/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb
index 15df0aebd..60add6e33 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 # 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 = "c296eb2"
+IMX_SRCREV_ABBREV = "e8a7ec7"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "997a7f79f291ef4b3c8dd3ba6f2f32c430c63feb4bb29d923f71da0d1ccf20a9"
+SRC_URI[sha256sum] = "90b4b7f7c3cffc9d57774dbb06e37d810a2618e059f30244e1b4155fb9bc82d5"
 inherit fsl-eula-unpack autotools pkgconfig
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch
deleted file mode 100644
index 74ea5206c..000000000
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a3c2f61649afd05e4bab457370f0b32d7644505c Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Mon, 3 Mar 2025 08:24:51 +0000
-Subject: [PATCH] vpu_wrapper_hantro_encoder: fix missing include
-gettimeofday is declared in sys/time.h. Add the include.
-Fixes the build error:
-| ../git/vpu_wrapper_hantro_encoder.c:953:3: error: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration]
-|   953 |   gettimeofday (&pObj->tvEnd, NULL);
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- vpu_wrapper_hantro_encoder.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/vpu_wrapper_hantro_encoder.c b/vpu_wrapper_hantro_encoder.c
-index 3819c389320c..a0bdb2f4f6c0 100755
--- a/vpu_wrapper_hantro_encoder.c
-+++ b/vpu_wrapper_hantro_encoder.c
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <time.h>
- #include <semaphore.h>
-+#include <sys/time.h>
- 
- #include "headers/OMX_Video.h"
- #include "headers/OMX_VideoExt.h"
-- 
-2.42.0
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index 98e9ea4de..1ad735152 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -1,23 +1,18 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright (C) 2017-2023 NXP
+# Copyright (C) 2017-2023,2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
-SRC_URI = " \
+SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}"
-    git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH} \
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-    file://0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch \
+SRCREV = "feeb9109a027d3a0f040b0bddb5f79a1daad3587"
-"
-SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
-SRCREV = "d8703ee3245797111ad21c52982efa8b6db33241"
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
index 2b2dbdfdc..cce4e56ad 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
@@ -14,8 +14,6 @@ SRCBRANCH ?= "master"
 SRCREV = "37095a854aa176bb763a25ce98ceb6a787501271"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
 inherit waf pkgconfig use-imx-headers python3native
 IMX_PLATFORM:mx6-nxp-bsp = "imx6"
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
index 9391a5fb4..55063db18 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
@@ -12,8 +12,6 @@ SRCBRANCH ?= "v1"
 SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
 inherit waf pkgconfig python3native
 COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
new file mode 100644
index 000000000..7afa44cb1
--- /dev/null
+++ b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
@@ -0,0 +1,41 @@
+# Copyright 2025 NXP
+DESCRIPTION = "NXP RetuneDSP Voice Seeker Libraries"
+SECTION = "multimedia"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
+inherit pkgconfig
+DEPENDS += "alsa-lib nxp-afe"
+PV = "2.0+git"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRC_URI = "git://github.com/nxp-imx/imx-voiceui.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "737c156469eeede28fe1a0777c968becf6fea886" 
+EXTRA_CONF = "--enable-armv8 --bindir=/unit_tests/ --libdir=${libdir}"
+EXTRA_OEMAKE:mx8-nxp-bsp = "BUILD_ARCH=CortexA53"
+EXTRA_OEMAKE:mx8ulp-nxp-bsp = "BUILD_ARCH=CortexA35"
+EXTRA_OEMAKE:mx9-nxp-bsp = "BUILD_ARCH=CortexA55"
+do_install() {
+    install -d ${D}${libdir}/nxp-afe
+    install -d ${D}/unit_tests/nxp-afe
+    install -m 0644 ${S}/release/*.so.2.0    ${D}${libdir}/nxp-afe/
+    ln -sf -r ${D}${libdir}/nxp-afe/libvoiceseekerlight.so.2.0 ${D}${libdir}/nxp-afe/libvoiceseekerlight.so
+    install -m 0755  ${S}/release/voice_ui_app    ${D}/unit_tests/nxp-afe
+    install -m 0644  ${S}/release/Config.ini    ${D}/unit_tests/nxp-afe
+}
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES:${PN} += "${libdir}/nxp-afe/* \
+                /unit_tests/* \
+"
+INSANE_SKIP:${PN} += "dev-so"
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
new file mode 100644
index 000000000..a401bedeb
--- /dev/null
+++ b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
@@ -0,0 +1,35 @@
+# Copyright 2025 NXP
+DESCRIPTION = "NXP Audio Front End (AFE) for incorporating Voice Assistants"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7bdef19938f3503cfc4c586461f99012"
+PV = "1.0+git"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRC_URI = " git://github.com/nxp-imx/nxp-afe.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "c6b8fee21376e724b8441f3cf6c04dee69b5242e"
+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
+        install -m 0644 ${UNPACKDIR}/deploy_afe/*.so.1.0 ${D}${libdir}/nxp-afe
+        ln -sf -r ${D}${libdir}/nxp-afe/libdummyimpl.so.1.0 ${D}${libdir}/nxp-afe/libdummyimpl.so
+        install -m 0755 ${UNPACKDIR}/deploy_afe/afe ${D}/unit_tests/nxp-afe
+        install -m 0644 ${UNPACKDIR}/deploy_afe/asound.conf*    ${D}/unit_tests/nxp-afe
+        install -m 0644 ${UNPACKDIR}/deploy_afe/TODO.md    ${D}/unit_tests/nxp-afe
+        install -m 0755 ${UNPACKDIR}/deploy_afe/UAC_VCOM_composite.sh    ${D}/unit_tests/nxp-afe
+}
+FILES:${PN} += "/unit_tests"
+INSANE_SKIP:${PN} += "dev-so"
diff --git a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
index f37e786b6..48edf0769 100644
--- a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
+++ b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
@@ -13,6 +13,4 @@ SRCREV = "f3ba6e5c2126f2fb07e3d890f990d50c3e204e67"
 EXTRA_OECONF:append = " --enable-pcm"
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc
index 7aeff9fd5..1112a864d 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-scarthgap/imx-6.6.52-2.2.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
 require optee-client-fslc.inc
@@ -10,27 +10,8 @@ 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}"
-# Copy the udev rule from the libts recipe for starting tee-supplicant@.service
-SRC_URI += "file://tee-udev.rules"
-# Unix group name for dev/tee* ownership.
-TEE_GROUP_NAME ?= "teeclnt"
-do_install:append () {
-    if ${@oe.utils.conditional('VIRTUAL-RUNTIME_dev_manager', 'busybox-mdev', 'false', 'true', d)}; then
-        install -d ${D}${nonarch_base_libdir}/udev/rules.d/
-        install -m 755 ${UNPACKDIR}/tee-udev.rules ${D}${nonarch_base_libdir}/udev/rules.d/
-        sed -i -e "s/teeclnt/${TEE_GROUP_NAME}/" ${D}${nonarch_base_libdir}/udev/rules.d/tee-udev.rules
-    fi
-    if [ "${libdir}" != "${nonarch_base_libdir}" ]; then
-        rm -rf ${D}${libdir}/systemd
-    fi
-}
-inherit ${@oe.utils.conditional('VIRTUAL-RUNTIME_dev_manager', 'busybox-mdev', '', 'useradd', d)}
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM:${PN} = "--system ${TEE_GROUP_NAME}"
-FILES:${PN} += "${libdir}/* ${includedir}/*"
diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
index 455bdd780..70a25fe6c 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-scarthgap/imx-6.6.52-2.2.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
 SUMMARY = "OP-TEE Client API"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
@@ -8,32 +8,39 @@ HOMEPAGE = "https://www.op-tee.org/"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
-inherit systemd update-rc.d cmake
+inherit systemd update-rc.d cmake useradd
 SRC_URI = " \
    git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https \
-    file://tee-supplicant@.service \
    file://tee-supplicant.sh \
 "
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
-S = "${WORKDIR}/git"
 EXTRA_OECMAKE = " \
    -DBUILD_SHARED_LIBS=ON \
-    -DCFG_TEE_FS_PARENT_PATH='${localstatedir}/lib/tee' \
+    -DCFG_USE_PKGCONFIG=ON \
 "
+# libts uses /dev/tee devices too. Add a common variable to allow configuring the same group.
+TEE_GROUP_NAME ?= "tee"
+EXTRA_OECMAKE += " -DCFG_ENABLE_SYSTEMD=On -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir}/"
+EXTRA_OECMAKE += " -DCFG_ENABLE_UDEV=On -DUDEV_UDEV_DIR=${nonarch_base_libdir}/udev/rules.d/"
+EXTRA_OECMAKE += " -DCFG_TEE_GROUP=${TEE_GROUP_NAME} -DCFG_TEEPRIV_GROUP=teepriv"
 EXTRA_OECMAKE:append:toolchain-clang = " -DCFG_WERROR=0"
 do_install:append() {
-    install -D -p -m0644 ${UNPACKDIR}/tee-supplicant@.service ${D}${systemd_system_unitdir}/tee-supplicant@.service
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-    install -D -p -m0755 ${UNPACKDIR}/tee-supplicant.sh ${D}${sysconfdir}/init.d/tee-supplicant
+        install -D -p -m0755 ${UNPACKDIR}/tee-supplicant.sh ${D}${sysconfdir}/init.d/tee-supplicant
+        sed -i -e s:@sysconfdir@:${sysconfdir}:g \
-    sed -i -e s:@sysconfdir@:${sysconfdir}:g \
+               -e s:@sbindir@:${sbindir}:g \
-           -e s:@sbindir@:${sbindir}:g \
+               -e s:@supluser@:teesuppl:g \
-              ${D}${systemd_system_unitdir}/tee-supplicant@.service \
+               -e s:@suplgroup@:teesuppl:g \
-              ${D}${sysconfdir}/init.d/tee-supplicant
+                  ${D}${sysconfdir}/init.d/tee-supplicant
+    fi
+    install -o teesuppl -g teesuppl -m 0700 -d ${D}${localstatedir}/lib/tee
 }
 SYSTEMD_SERVICE:${PN} = "tee-supplicant@.service"
@@ -41,3 +48,13 @@ SYSTEMD_SERVICE:${PN} = "tee-supplicant@.service"
 INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME:${PN} = "tee-supplicant"
 INITSCRIPT_PARAMS:${PN} = "start 10 1 2 3 4 5 . stop 90 0 6 ."
+FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d/"
+# Users and groups:
+# TEE_GROUP_NAME group to access /dev/tee*
+# teepriv group to acess /dev/teepriv*, only tee-supplicant
+# teesuppl user and group teesuppl to run tee-supplicant
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM:${PN} = "--system ${TEE_GROUP_NAME}; --system teepriv; --system teesuppl"
+USERADD_PARAM:${PN} = "--system -g teesuppl --groups teepriv --home-dir ${localstatedir}/lib/tee -M --shell /sbin/nologin teesuppl;"
diff --git a/recipes-security/optee-imx/optee-client/0001-tee-supplicant-Fix-non-arch-service-unit-install-pat.patch b/recipes-security/optee-imx/optee-client/0001-tee-supplicant-Fix-non-arch-service-unit-install-pat.patch
new file mode 100644
index 000000000..631e08019
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client/0001-tee-supplicant-Fix-non-arch-service-unit-install-pat.patch
@@ -0,0 +1,35 @@
+From 5ffab66dda3e25f0b2ebc5115013c4234d048703 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Mon, 21 Apr 2025 08:47:29 -0500
+Subject: [PATCH] tee-supplicant: Fix non-arch service unit install path
+A 64-bit build with multilib enabled fails:
+```
+ERROR: optee-client-4.4.0-r0 do_package: Didn't find service unit 'tee-supplicant@.service', specified in SYSTEMD_SERVICE:optee-client. Also looked for service unit 'tee-supplicant@.service'.
+```
+The problem is the service unit is installed in the arch-specific folder
+/usr/lib64/systemd/system, but it is non-arch and should be in
+/usr/lib/systemd/system.
+Upstream-Status: Pending
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+---
+ tee-supplicant/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt
+index 8df9bef..3ea058c 100644
+--- a/tee-supplicant/CMakeLists.txt
+++ b/tee-supplicant/CMakeLists.txt
+@@ -119,6 +119,6 @@ endif()
+ ################################################################################
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
+ configure_file(tee-supplicant@.service.in tee-supplicant@.service @ONLY)
+-install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}/tee-supplicant@.service DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system)
+install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}/tee-supplicant@.service DESTINATION lib/systemd/system)
+ configure_file(optee-udev.rules.in optee-udev.rules @ONLY)
+ install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}/optee-udev.rules DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d)
+-- 
+2.34.1
diff --git a/recipes-security/optee-imx/optee-client/optee-udev.rules b/recipes-security/optee-imx/optee-client/optee-udev.rules
new file mode 100644
index 000000000..075f469c0
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client/optee-udev.rules
@@ -0,0 +1,6 @@
+KERNEL=="tee[0-9]*", MODE="0660", OWNER="root", GROUP="teeclnt", TAG+="systemd"
+# If a /dev/teepriv[0-9]* device is detected, start an instance of
+# tee-supplicant.service with the device name as parameter
+KERNEL=="teepriv[0-9]*", MODE="0660", OWNER="root", GROUP="teeclnt", \
+    TAG+="systemd", ENV{SYSTEMD_WANTS}+="tee-supplicant@%k.service"
diff --git a/recipes-security/optee-imx/optee-client_4.4.0.imx.bb b/recipes-security/optee-imx/optee-client_4.4.0.imx.bb
deleted file mode 100644
index 322f998fc..000000000
--- a/recipes-security/optee-imx/optee-client_4.4.0.imx.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require optee-client-fslc-imx.inc
-SRCBRANCH = "lf-6.6.52_2.2.0"
-SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
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
new file mode 100644
index 000000000..b5a185da1
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client_4.6.0.imx.bb
@@ -0,0 +1,4 @@
+require optee-client-fslc-imx.inc
+SRCBRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
diff --git a/recipes-security/optee-imx/optee-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc
index c89746dc4..599dda522 100644
--- a/recipes-security/optee-imx/optee-fslc.inc
+++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -1,14 +1,16 @@
 # Copied from meta-arm/recipes-security/optee/optee.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-scarthgap/imx-6.6.52-2.2.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 COMPATIBLE_MACHINE ?= "invalid"
+COMPATIBLE_MACHINE:genericarm64 ?= "genericarm64"
 COMPATIBLE_MACHINE:qemuarm64 ?= "qemuarm64"
 COMPATIBLE_MACHINE:qemuarm ?= "qemuarm"
 # Please add supported machines below or set it in .bbappend or .conf
 OPTEEMACHINE ?= "${MACHINE}"
+OPTEEMACHINE:genericarm64 ?= "vexpress-qemu_armv8a"
 OPTEEMACHINE:aarch64:qemuall ?= "vexpress-qemu_armv8a"
 OPTEEMACHINE:arm:qemuall ?= "vexpress-qemu_virt"
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 941182fe9..ffd217099 100644
--- a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -1,6 +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-scarthgap/imx-6.6.52-2.2.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
 require optee-os-fslc.inc
 DEPENDS:append:arm = "u-boot-mkimage-native"
@@ -38,6 +37,7 @@ OPTEEMACHINE:mx8mnul-nxp-bsp   = "imx-mx8mnevk"
 OPTEEMACHINE:mx8ulp-nxp-bsp    = "imx-mx8ulpevk"
 OPTEEMACHINE:mx91-nxp-bsp      = "imx-mx91evk"
 OPTEEMACHINE:mx93-nxp-bsp      = "imx-mx93evk"
+OPTEEMACHINE:mx943-nxp-bsp     = "imx-mx943evk"
 OPTEEMACHINE:mx95-nxp-bsp      = "imx-mx95evk"
 # Strip the leading imx-
diff --git a/recipes-security/optee-imx/optee-os-fslc-imx.inc b/recipes-security/optee-imx/optee-os-fslc-imx.inc
index 5fe6a75a5..f46f666ee 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-scarthgap/imx-6.6.52-2.2.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
 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 c1f1f48f5..4df1617d1 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-scarthgap/imx-6.6.52-2.2.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
 SUMMARY = "OP-TEE Trusted OS"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Trusted side of the TEE"
@@ -19,7 +19,6 @@ DEPENDS:append:toolchain-clang = " compiler-rt"
 SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 EXTRA_OEMAKE += " \
@@ -27,7 +26,7 @@ EXTRA_OEMAKE += " \
    CFG_${OPTEE_CORE}_core=y \
    CROSS_COMPILE_core=${HOST_PREFIX} \
    CROSS_COMPILE_ta_${OPTEE_ARCH}=${HOST_PREFIX} \
-    NOWERROR=1 \
+    AFLAGS="${CFLAGS}" \
    ta-targets=ta_${OPTEE_ARCH} \
    O=${B} \
 "
@@ -40,7 +39,7 @@ AS[unexport] = "1"
 LD[unexport] = "1"
 do_compile:prepend() {
-        PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name)
+        PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name)
 }
 do_compile() {
@@ -79,8 +78,5 @@ FILES:${PN}-ta = "${nonarch_base_libdir}/optee_armtz/*"
 # note: "textrel" is not triggered on all archs
 INSANE_SKIP:${PN} = "textrel"
-# Build paths are currently embedded
-INSANE_SKIP:${PN} += "buildpaths"
 INSANE_SKIP:${PN}-dev = "staticdev"
 INHIBIT_PACKAGE_STRIP = "1"
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 18cf9a374..0b02c6908 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-scarthgap/imx-6.6.52-2.2.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
 require optee-os-common-fslc-imx.inc
@@ -22,6 +22,3 @@ 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.4.0.imx.bb b/recipes-security/optee-imx/optee-os-tadevkit_4.4.0.imx.bb
deleted file mode 100644
index bb2e2cf6b..000000000
--- a/recipes-security/optee-imx/optee-os-tadevkit_4.4.0.imx.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require optee-os-tadevkit-fslc-imx.inc
-SRCBRANCH = "lf-6.6.52_2.2.0"
-SRCREV = "60beb308810f9561a67fdb435388a64c85eb6dcb"
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
new file mode 100644
index 000000000..92bdf00e7
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os-tadevkit_4.6.0.imx.bb
@@ -0,0 +1,4 @@
+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_4.4.0.imx.bb b/recipes-security/optee-imx/optee-os_4.4.0.imx.bb
deleted file mode 100644
index dc6d3901d..000000000
--- a/recipes-security/optee-imx/optee-os_4.4.0.imx.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2017-2024 NXP
-require optee-os-fslc-imx.inc
-SRCBRANCH = "lf-6.6.52_2.2.0"
-SRCREV = "60beb308810f9561a67fdb435388a64c85eb6dcb"
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
new file mode 100644
index 000000000..ed2557bcb
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os_4.6.0.imx.bb
@@ -0,0 +1,6 @@
+# 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-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc
index ab16fd221..b4bb6031b 100644
--- a/recipes-security/optee-imx/optee-test-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc
@@ -1,6 +1,5 @@
 # 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-scarthgap/imx-6.6.52-2.2.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
 require optee-test-fslc.inc
 DEPENDS += "openssl"
@@ -14,5 +13,6 @@ OPTEE_TEST_SRC ?= "git://github.com/nxp-imx/imx-optee-test.git;protocol=https"
 EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}"
 CFLAGS:append:libc-musl = " -Wno-error=deprecated-declarations"
+CFLAGS += " -Wno-error=unterminated-string-initialization"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc
index 0fb5f878a..46d57ac41 100644
--- a/recipes-security/optee-imx/optee-test-fslc.inc
+++ b/recipes-security/optee-imx/optee-test-fslc.inc
@@ -1,12 +1,11 @@
 # Copied from meta-arm/recipes-security/optee/optee-test.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-scarthgap/imx-6.6.52-2.2.0.xml#L30
+# See:https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
 SUMMARY = "OP-TEE sanity testsuite"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
 HOMEPAGE = "https://www.op-tee.org/"
 LICENSE = "BSD-2-Clause & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 inherit python3native ptest
 inherit deploy
@@ -18,7 +17,6 @@ SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
           file://run-ptest \
          "
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
diff --git a/recipes-security/optee-imx/optee-test_4.4.0.imx.bb b/recipes-security/optee-imx/optee-test_4.6.0.imx.bb
index b4ac12714..78e933486 100644
--- a/recipes-security/optee-imx/optee-test_4.4.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.6.0.imx.bb
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
                    file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
-SRCBRANCH = "lf-6.6.52_2.2.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "dafc98ed8364d7281a9a7f0788dd0a2067844a59"
+SRCREV = "010f088f05b5ebf392c6e235d6e53d391755722f" 
diff --git a/recipes-security/optee-qoriq/optee-client-qoriq_3.13.0.bb b/recipes-security/optee-qoriq/optee-client-qoriq_3.13.0.bb
deleted file mode 100644
index 94123e435..000000000
--- a/recipes-security/optee-qoriq/optee-client-qoriq_3.13.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require optee-client.nxp.inc
-PV:append = "+git${SRCPV}"
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb b/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb
new file mode 100644
index 000000000..4b61f7c04
--- /dev/null
+++ b/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb
@@ -0,0 +1,4 @@
+require optee-client.nxp.inc
+OPTEE_CLIENT_BRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
diff --git a/recipes-security/optee-qoriq/optee-client.nxp.inc b/recipes-security/optee-qoriq/optee-client.nxp.inc
index c3933a243..590540cd8 100644
--- a/recipes-security/optee-qoriq/optee-client.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-client.nxp.inc
@@ -1,53 +1,22 @@
-# Copyright 2020-2021 NXP
+# Copyright 2020-2021,2025 NXP
-SUMMARY = "OPTEE Client libs"
+require recipes-security/optee-imx/optee-client-fslc.inc
-HOMEPAGE = "http://www.optee.org/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
-inherit python3native systemd
+# The patch same as imx-optee, so point FILESEXTRAPATHS to optee-imx/optee-client,
+# avoid duplicate copy files to optee-qoriq
+FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-client:"
-SRC_URI = "git://github.com/nxp-qoriq/optee_client.git;protocol=https;nobranch=1"
+DEPENDS = "util-linux-libuuid"
-SRCREV = "7c9c423d00e96bf51debd5fe10fd70dce83be5cc"
-FILESEXTRAPATHS:prepend := "${THISDIR}/optee-client:"
+SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https"
-SRC_URI += "file://tee-supplicant.service"
+SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${OPTEE_CLIENT_BRANCH} "
-S = "${WORKDIR}/git"
+OPTEE_CLIENT_SRC ?= "git://github.com/nxp-qoriq/optee_client.git;protocol=https"
-B = "${WORKDIR}/build"
-OPTEE_ARCH ?= "arm32"
+inherit pkgconfig
-OPTEE_ARCH:armv7a = "arm32"
-OPTEE_ARCH:aarch64 = "arm64"
-EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}"
+do_install:append () {
+    if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-do_install () {
+        rm -rf ${D}${libdir}/systemd
-        oe_runmake -C ${S} install
+    fi
-        install -d ${D}${libdir}/
-        install -p -m0644 ${B}/export${libdir}/libteec.so.1.0.0 ${D}${libdir}/
-        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0
-        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1
-        ln -sf libteec.so.1 ${D}${libdir}/libteec.so
-        install -D -p -m0644 ${B}/export/usr/lib/libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0.1.0
-        ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0.1
-        ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0
-        ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so
-        install -D -p -m0755 ${B}/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant
-        cp -a ${B}/export/usr/include ${D}${includedir}
-        install -d ${D}${systemd_system_unitdir}/
-        install -m0644 ${UNPACKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/
-        sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${D}${systemd_system_unitdir}/tee-supplicant.service
 }
-SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
-FILES:${PN} += "${libdir}/* ${includedir}/*"
-INSANE_SKIP:${PN} = "ldflags dev-elf"
-INSANE_SKIP:${PN}-dev = "ldflags dev-elf"
diff --git a/recipes-security/optee-qoriq/optee-client/tee-supplicant.service b/recipes-security/optee-qoriq/optee-client/tee-supplicant.service
deleted file mode 100644
index 0e2b4f6ba..000000000
--- a/recipes-security/optee-qoriq/optee-client/tee-supplicant.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=TEE Supplicant
-[Service]
-User=root
-EnvironmentFile=-/etc/default/tee-supplicant
-ExecStart=/usr/bin/tee-supplicant $OPTARGS
-[Install]
-WantedBy=basic.target
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.6.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.6.0.bb
new file mode 100644
index 000000000..e7847b81e
--- /dev/null
+++ b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.6.0.bb
@@ -0,0 +1,24 @@
+require optee-os.nxp.inc
+SUMMARY = "OP-TEE Trusted OS TA devkit"
+DESCRIPTION = "OP-TEE TA devkit for build TAs"
+HOMEPAGE = "https://www.op-tee.org/"
+DEPENDS += "python3-pycryptodome-native"
+OPTEE_OS_BRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
+do_install() {
+    #install TA devkit
+    install -d ${D}${includedir}/optee/export-user_ta/
+    for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do
+        cp -aR $f ${D}${includedir}/optee/export-user_ta/
+    done
+}
+do_deploy() {
+        echo "Do not inherit do_deploy from optee-os."
+}
+FILES:${PN} = "${includedir}/optee/"
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq_3.13.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq_3.13.0.bb
deleted file mode 100644
index 3c3652d3d..000000000
--- a/recipes-security/optee-qoriq/optee-os-qoriq_3.13.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require optee-os.nxp.inc
-PV:append = "+git${SRCPV}"
-PLATFORM_FLAVOR:ls1088ardb-pb   = "ls1088ardb"
-PLATFORM_FLAVOR:ls1046afrwy     = "ls1046ardb"
-PLATFORM_FLAVOR:lx2162aqds      = "lx2160aqds"
-EXTRA_OEMAKE += " \
-    PLATFORM=ls \
-    CFG_ARM64_core=y \
-"
-do_compile:append:ls1012afrwy() {
-    mv ${B}/core/tee-raw.bin  ${B}/core/tee_512mb.bin
-    oe_runmake CFG_DRAM0_SIZE=0x40000000 all
-}
-do_install:append:qoriq() {
-    install -m 644 ${B}/core/tee-raw.bin ${D}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin
-}
-do_install:append:ls1012afrwy() {
-    install -m 644 ${B}/core/tee_512mb.bin ${D}${nonarch_base_libdir}/firmware/tee_${MACHINE}_512mb.bin
-}
-INHIBIT_PACKAGE_STRIP = "1"
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq_4.6.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq_4.6.0.bb
new file mode 100644
index 000000000..cd568b3dc
--- /dev/null
+++ b/recipes-security/optee-qoriq/optee-os-qoriq_4.6.0.bb
@@ -0,0 +1,21 @@
+require optee-os.nxp.inc
+OPTEE_OS_BRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
+do_install:append () {
+        install -d ${D}${nonarch_base_libdir}/firmware/
+        install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
+        install -m 644 ${B}/core/tee-raw.bin ${D}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin
+        # Install embedded TAs
+        install -d ${D}${base_libdir}/optee_armtz/
+        install -m 444 ${B}/ta/*/*.ta ${D}${base_libdir}/optee_armtz/
+}
+do_deploy:append () {
+        install -d ${DEPLOYDIR}/optee
+        install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/
+}
+FILES:${PN} = "${nonarch_base_libdir}/optee_armtz/ ${nonarch_base_libdir}/firmware/"
diff --git a/recipes-security/optee-qoriq/optee-os.nxp.inc b/recipes-security/optee-qoriq/optee-os.nxp.inc
index 5b90b937c..88ba3fbe2 100644
--- a/recipes-security/optee-qoriq/optee-os.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-os.nxp.inc
@@ -1,75 +1,30 @@
-# Copyright 2020-2021 NXP
+# Copyright 2020-2021,2025 NXP
+require recipes-security/optee-imx/optee-os-fslc.inc
-SUMMARY = "OPTEE OS"
+DEPENDS:append = " dtc-native"
-DESCRIPTION = "OPTEE OS"
-HOMEPAGE = "http://www.optee.org/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
-inherit deploy python3native autotools
+# The patch same as imx-optee, so point FILESEXTRAPATHS to optee-imx/optee-client,
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-pycryptodomex-native dtc-native"
+# avoid duplicate copy files to optee-qoriq
+FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-os:"
-SRC_URI = "git://github.com/nxp-qoriq/optee_os.git;protocol=https;nobranch=1"
+SRC_URI:remove = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
-SRCREV = "735d98806dc26fbeeecad7f5e60ffeab8170c67e"
+SRC_URI:prepend = "${OPTEE_OS_SRC};branch=${OPTEE_OS_BRANCH} "
+SRC_URI:append = " file://0007-allow-setting-sysroot-for-clang.patch"
-S = "${WORKDIR}/git"
+OPTEE_OS_SRC ?= "git://github.com/nxp-qoriq/optee_os.git;protocol=https"
-B = "${WORKDIR}/build.${PLATFORM_FLAVOR}"
-PLATFORM_FLAVOR ?= "${MACHINE}"
+REQUIRED_MACHINE_FEATURES = "optee"
-OPTEE_ARCH ?= "arm64"
+inherit features_check
-OPTEE_ARCH:armv7a = "arm32"
-OPTEE_ARCH:aarch64 = "arm64"
-OPTEE_CORE_LOG_LEVEL ?= "1"
+OPTEEMACHINE = "ls-${MACHINE}"
-OPTEE_TA_LOG_LEVEL ?= "0"
+OPTEEMACHINE:ls1088ardb-pb   = "ls-ls1088ardb"
+OPTEEMACHINE:ls1046afrwy     = "ls-ls1046ardb"
+OPTEEMACHINE:lx2162aqds      = "ls-lx2160aqds"
+OPTEEMACHINE:lx2160ardb-rev2 = "ls-lx2160ardb"
-# Optee-os can be built for 32 bits and 64 bits at the same time
+EXTRA_OEMAKE:append = " \
-# as long as the compilers are correctly defined.
+    CFG_TEE_TA_LOG_LEVEL=0 \
-# For 64bits, CROSS_COMPILE64 must be set
+    CFG_TEE_CORE_LOG_LEVEL=1 \
-# When defining CROSS_COMPILE and CROSS_COMPILE64, we assure that
-# any 32 or 64 bits builds will pass
-EXTRA_OEMAKE = " \
-        -C ${S} O=${B} \
-        PLATFORM_FLAVOR=${PLATFORM_FLAVOR} \
-        CROSS_COMPILE=${HOST_PREFIX} \
-        CROSS_COMPILE64=${HOST_PREFIX} \
-        CFG_WERROR=y \
-        CFG_TEE_CORE_LOG_LEVEL=${OPTEE_CORE_LOG_LEVEL} \
-        CFG_TEE_TA_LOG_LEVEL=${OPTEE_TA_LOG_LEVEL} \
 "
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-do_compile() {
-    unset LDFLAGS
-    export CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_HOST}"
-    oe_runmake all
-}
-do_install() {
-    install -d ${D}${nonarch_base_libdir}/firmware/
-    install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
-    # Install the TA devkit
-    install -d ${D}${includedir}/optee/export-user_ta/
-    for f in ${B}/export-ta_${OPTEE_ARCH}/*; do
-        cp -aR $f ${D}${includedir}/optee/export-user_ta/
-    done
-    install -d ${D}${nonarch_base_libdir}/optee_armtz
-    find ${B}/export-ta_${OPTEE_ARCH}/ta -name '*.ta' | while read name; do
-        install -m 444 $name ${D}${nonarch_base_libdir}/optee_armtz/
-    done
-}
-do_deploy() {
-    install -d ${DEPLOYDIR}/optee
-    install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/
-}
-addtask deploy before do_build after do_install
-FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/"
-FILES:${PN}-staticdev = "/usr/include/optee/"
-RDEPENDS:${PN}-dev += "${PN}-staticdev"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee-qoriq/optee-test-qoriq_3.13.0.bb b/recipes-security/optee-qoriq/optee-test-qoriq_3.13.0.bb
deleted file mode 100644
index 69ef73d3a..000000000
--- a/recipes-security/optee-qoriq/optee-test-qoriq_3.13.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require optee-test.nxp.inc
-PV:append = "+git${SRCPV}"
-DEPENDS += "optee-client-qoriq optee-os-qoriq"
-TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}"
-EXTRA_OEMAKE += " \
-    TEEC_EXPORT=${TEEC_EXPORT} \
-"
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-security/optee-qoriq/optee-test-qoriq_4.6.0.bb b/recipes-security/optee-qoriq/optee-test-qoriq_4.6.0.bb
new file mode 100644
index 000000000..d008a6211
--- /dev/null
+++ b/recipes-security/optee-qoriq/optee-test-qoriq_4.6.0.bb
@@ -0,0 +1,10 @@
+require optee-test.nxp.inc
+# The BSD and GPL license files are now included in the source
+# https://github.com/OP-TEE/optee_test/commit/a748f5fcd9ec8a574dc86a5aa56d05bc6ac174e7
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
+                    file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
+                    file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
+OPTEE_TEST_BRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "010f088f05b5ebf392c6e235d6e53d391755722f"
diff --git a/recipes-security/optee-qoriq/optee-test.nxp.inc b/recipes-security/optee-qoriq/optee-test.nxp.inc
index 14a42ac5a..48d5a4211 100644
--- a/recipes-security/optee-qoriq/optee-test.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-test.nxp.inc
@@ -1,61 +1,15 @@
-# Copyright 2020-2021 NXP
+# Copyright 2020-2021,2025 NXP
+require recipes-security/optee-imx/optee-test-fslc.inc
-SUMMARY = "OPTEE test"
+DEPENDS:remove = "optee-client optee-os-tadevkit"
-HOMEPAGE = "http://www.optee.org/"
+DEPENDS:append = "optee-client-qoriq optee-os-qoriq-tadevkit openssl"
-LICENSE = "BSD & GPL-2.0-only"
+SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
+SRC_URI:remove = "file://run-ptest"
+SRC_URI:prepend = "${OPTEE_TEST_SRC};branch=${OPTEE_TEST_BRANCH} "
-DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native openssl"
+OPTEE_TEST_SRC ?= "git://github.com/nxp-qoriq/optee_test.git;protocol=https"
-inherit python3native cmake
-SRC_URI = "git://github.com/nxp-qoriq/optee_test.git;protocol=https;nobranch=1"
+CFLAGS += " -Wno-error=unterminated-string-initialization"
-SRCREV = "69722dab8c1f2683e30e0ee3b536053367e37aad"
-S = "${WORKDIR}/git"
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-B = "${WORKDIR}/build"
-TA_DEV_KIT_DIR ?= "${STAGING_INCDIR}/optee/export-user_ta"
-OPTEE_CLIENT_EXPORT ?= "${STAGING_DIR_HOST}${prefix}"
-EXTRA_OEMAKE = " \
-    TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
-    OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \
-    CROSS_COMPILE_HOST=${HOST_PREFIX} \
-    CROSS_COMPILE_TA=${HOST_PREFIX} \
-    OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}/ \
-    -C ${S} O=${B} \
-"
-EXTRA_OECMAKE = " \
-    -DOPTEE_TEST_SDK=${TA_DEV_KIT_DIR} \
-"
-do_compile() {
-    export CXXFLAGS="${CXXFLAGS} --sysroot=${STAGING_DIR_HOST}"
-    oe_runmake xtest
-    oe_runmake ta
-    oe_runmake test_plugin
-}
-do_install() {
-        install -d ${D}${bindir}/
-        install ${B}/xtest/xtest ${D}${bindir}/
-        install -d ${D}${nonarch_base_libdir}/optee_armtz
-        find ${B}/ta -name '*.ta' | while read name; do
-                install -m 444 $name ${D}${nonarch_base_libdir}/optee_armtz/
-        done
-        install -d ${D}${libdir}/tee-supplicant/plugins/
-        find ${B}/supp_plugin -name '*.plugin' | while read name; do
-                install -m 755 $name ${D}${libdir}/tee-supplicant/plugins/
-        done
-}
-FILES:${PN} += "${nonarch_base_libdir} ${libdir}/tee-supplicant/plugins/"
-DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized -Wno-deprecated-declarations"
-FULL_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized -Wno-deprecated-declarations"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb
index 25a5f656a..f147e1148 100644
--- a/recipes-security/smw/keyctl-caam_git.bb
+++ b/recipes-security/smw/keyctl-caam_git.bb
@@ -11,13 +11,11 @@ SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCB
 SRCREV = "81dc06cdb9c4d0d4ba10459d85af9a8603774948"
-S = "${WORKDIR}/git"
 TARGET_CC_ARCH += "${LDFLAGS}"
 do_install () {
        oe_runmake DESTDIR=${D} install
 }
-COMPATIBLE_MACHINE = "(imx-generic-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp|qoriq)"
diff --git a/recipes-security/smw/smw_git.bb b/recipes-security/smw/smw_git.bb
index 3c1d04908..dbb59d2f3 100644
--- a/recipes-security/smw/smw_git.bb
+++ b/recipes-security/smw/smw_git.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://github.com/nxp-imx/imx-smw.git;protocol=https;branch=release/ve
 SRCREV_smw = "f0570b3e8cb5f68d54edc4f9dd7cb984f6f604ed"
 SRCREV_psa = "463cb95ada820bc6f758d50066cf8c0ed5cc3a02"
 SRCREV_FORMAT = "smw_psa"
-S = "${WORKDIR}/git/smw"
+S = "${UNPACKDIR}/git/smw"
 inherit cmake python3native
diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb
index 303273b10..0195bc61a 100644
--- a/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/recipes-support/opencv/opencv_4.6.0.imx.bb
@@ -47,12 +47,12 @@ IPP_MD5 = "${@ipp_md5sum(d)}"
 SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
 SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \
-           git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \
+           git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=master;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=git/ipp;name=ipp;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/ipp;name=ipp;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/boostdesc;name=boostdesc;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vgg;name=vgg;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/face;name=face;protocol=https \
-           git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \
+           git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/wechat_qrcode;name=wechat-qrcode;protocol=https \
           file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
           file://0003-To-fix-errors-as-following.patch \
           file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
@@ -64,11 +64,9 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol
           "
 SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"
-S = "${WORKDIR}/git"
 # OpenCV wants to download more files during configure.  We download these in
 # do_fetch and construct a source cache in the format it expects
-OPENCV_DLDIR = "${WORKDIR}/downloads"
+OPENCV_DLDIR = "${UNPACKDIR}/downloads"
 do_unpack_extra() {
    tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S}
@@ -141,7 +139,7 @@ PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_P
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
 PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
 PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
-PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd,"
+PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/libopencl1,"
 PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
 PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
 PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy,"