352 files changed, 5416 insertions, 4999 deletions
diff --git a/.github/workflows/update-license-file.yml b/.github/workflows/update-license-file.yml
new file mode 100644
index 000000000..2ccfe6636
--- /dev/null
+++ b/.github/workflows/update-license-file.yml
@@ -0,0 +1,47 @@
+name: Update LICENSE file
+on:
+  push:
+    branches:
+      - master
+      - walnascar
+      - styhead
+      - scarthgap
+      - nanbield
+      - mickledore
+      - kirkstone
+      - honister
+      - hardknott
+      - gatesgarth
+      - dunfell
+    paths:
+      - "**/*.bb"
+      - "**/*.inc"
+  schedule:
+    - cron: "0 0 * * *" # Runs daily at midnight
+  workflow_dispatch: # Allows manual run
+jobs:
+  update-license:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Run license generation script
+        run: |
+          ./scripts/generate-license-file
+      - name: Commit and push LICENSE file
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git add LICENSE
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Auto-update LICENSE file with current recipe licenses"
+            git push
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/EULA b/EULA
index 64d5ecb6b..5f5cc2f96 100644
--- a/EULA
+++ b/EULA
@@ -1,4 +1,4 @@
-LA_OPT_NXP_Software_License v53 December 2023
+LA_OPT_NXP_Software_License v58 November 2024
 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
@@ -15,7 +15,9 @@ supersede this Agreement.
 NXP SOFTWARE LICENSE AGREEMENT
 This is a legal agreement between your employer, of which you are an authorized
 representative, or, if you have no employer, you as an individual ("you" or
-"Licensee"), and NXP B.V. ("NXP").  It concerns your rights to use the software
+"Licensee"), and and NXP USA, Inc., if Licensee is located within the United
+States or NXP Semiconductors Netherlands B.V., if Licensee if located outside
+of the United States (“NXP”).  It concerns your rights to use the software
 provided to you in binary or source code form and any accompanying written
 materials (the "Licensed Software"). The Licensed Software may include any
 updates or error corrections or documentation relating to the Licensed Software
@@ -240,21 +242,51 @@ 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. Each party shall comply with all applicable
+12.        EXPORT COMPLIANCE.
-export and import control laws and regulations including but not limited to the
+12.1    Each party shall comply with all applicable export and import control
-US Export Administration Regulation (including restrictions on certain military
+laws and regulations including but not limited to the US Export Administration
-end uses and military end users as specified in Section 15 C.F.R. § 744.21 and
+Regulation (including restrictions on certain military end uses and military
-prohibited party lists issued by other federal governments), Catch-all
+end users as specified in Section 15 C.F.R. § 744.21 and prohibited party
-regulations and all national and international embargoes. Each party further
+lists issued by other federal governments), Catch-all regulations and all
-agrees that it will not knowingly transfer, divert, export or re-export,
+national and international embargoes. Each party further agrees that it will
-directly or indirectly, any product, software, including software source code,
+not knowingly transfer, divert, export or re-export, directly or indirectly,
-or technology restricted by such regulations or by other applicable national
+any product, software, including software source code, or technology restricted
-regulations, received from the other party under this Agreement, or any direct
+by such regulations or by other applicable national regulations, received from
-product of such software or technical data to any person, firm, entity, country
+the other party under this Agreement, or any direct product of such software or
-or destination to which such transfer, diversion, export or re-export is
+technical data to any person, firm, entity, country or destination to which
-restricted or prohibited, without obtaining prior written authorization from
+such transfer, diversion, export or re-export is restricted or prohibited,
-the applicable competent government authorities to the extent required by those
+without obtaining prior written authorization from the applicable competent
-laws.
+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,
+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
+any intellectual property rights or trade secrets, to the Russian Federation or
+Belarus, or for use in the Russian Federation or Belarus.
+(b)     You will ensure that the purpose of paragraph (a) above is not
+frustrated by any third parties further down the commercial chain, including by
+either resellers, sublicensees, or both.
+(c)     You will set up and maintain an adequate monitoring mechanism to detect
+conduct by any third parties further down the commercial chain, including by
+either resellers, sublicensees, or both, that would frustrate the purpose of
+paragraph (a).
+(d)     Any violation of paragraphs (a), (b) or (c) will constitute a material
+breach of this Agreement, and NXP will be entitled to seek appropriate
+remedies, including, but not limited to: (i) termination of these Terms; (ii)
+suspension of any of its business relationships with you, youraffiliates or
+both, until the breach of paragraph (a) above is remedied, and (iii) a plan to
+remedy the breach.
+(e)     You will immediately inform NXP about any problems in applying
+paragraphs (a), (b) or (c), above, including any relevant activities by third
+parties that could frustrate the purpose of paragraph (a). You will make
+available to NXPinformation concerning compliance with the obligations under
+paragraphs (a), (b) and (c) within 2 weeks of the request for information.
 13.   GOVERNMENT CONTRACT COMPLIANCE
 13.1.      If you sell Authorized Systems directly to any government or public
 entity, including U.S., state, local, foreign or international governments or
@@ -290,13 +322,20 @@ APPLICATIONS BY LICENSEE. Accordingly, Licensee will indemnify and hold NXP
 harmless from any claims, liabilities, damages and associated costs and
 expenses (including attorneys’ fees) that NXP may incur related to
 Licensee’s incorporation of the Licensed Software in a Critical Application.
-15.        CHOICE OF LAW; VENUE.  This Agreement will be governed by,
+15.        CHOICE OF LAW; VENUE.  When Software is licensed by NXP USA, Inc.,
-construed, and enforced in accordance with the laws of The Netherlands, without
+Licensee agrees that the laws of the State of Texas, USA, without regard to
-regard to conflicts of laws principles, will apply to all matters relating to
+conflicts of laws principles, will apply to all matters relating to this
-this Agreement or the Licensed Software, and you agree that any litigation will
+Agreement or the Software, and Licensee agrees that any litigation will be
-be subject to the exclusive jurisdiction of the courts of Amsterdam, The
+subject to the exclusive jurisdiction of the state or federal courts in Austin,
-Netherlands. The United Nations Convention on Contracts for the International
+Texas, USA..  When Software is licensed by NXP Semiconductors Netherlands B.V.,
-Sale of Goods will not apply to this document.
+Licensee agrees that the laws of The Netherlands, without regard to conflicts
+of laws principles, will apply to all matters relating to this Agreement or the
+Software, and Licensee agrees that any litigation will be subject to the
+exclusive jurisdiction of the courts in Amsterdam, The Netherlands.
+Notwithstanding the foregoing, NXP will always be permitted to bring any action
+or proceedings against Licensee in any other court of competent jurisdiction.
+The United Nations Convention on Contracts for the International Sale of Goods
+will not apply to this document.
 16.        CONFIDENTIAL INFORMATION.  Subject to the license grants and
 restrictions contained herein, you must treat the Licensed Software as
 confidential information and you agree to retain the Licensed Software in
@@ -394,7 +433,7 @@ directly from AGGIOS, Inc.
 Airbiquity Inc.: The Airbiquity software may only be used in object code and
 Licensee may not sublicense the Airbiquity software to any third party.
-Licensee’s license to use the Airbiquity software expires on June 30, 2024.
+Licensee’s license to use the Airbiquity software expires on June 30, 2026.
 Amazon: Use of the Amazon software constitutes your acceptance of the terms of
 the Amazon Program Materials License Agreement (including the AVS Component
@@ -555,7 +594,15 @@ Lumissil: Use of the Lumissil software constitutes your acceptance of the terms
 of the Lumissil Software License Agreement.  A link to the agreement is
 incorporated as follows:
 https://www.lumissil.com/assets/pdf/support/2023%20Lumissil%20IS3xCG5317%20Softw
-are%20License%20Agreement%20NXP.pdf .
+are%20License%20Agreement%20NXP.pdf .  The Run-Time Software and Boot ROM Code
+are without warranty of any kind from NXP or Lumissil, 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 arising out of the use or performance of the Lumissil
+software, or any systems you design using the such, if any.  For the use of
+Lumissil software, Lumissil is as a third-party beneficiary of the this
+Agreement with authority to enforce its rights in the Run-Time Software and
+Boot ROM Code.
 Microsoft: Except for Microsoft PlayReady software, if the Licensed Software
 includes software owned by Microsoft Corporation ("Microsoft"), it is subject
@@ -727,10 +774,16 @@ sublicense or otherwise distribute the source code, or any modifications or
 derivatives thereof as stand-alone products.  You will be responsible for
 qualifying any modifications or derivatives with the Bluetooth SIG and any
 other qualifying bodies.
 TARA Systems: Use of TARA Systems GUI technology Embedded Wizard is limited to
 evaluation and demonstration only. Permitted distributions must be similarly
 limited. Further rights must be obtained directly from TARA Systems.
+Teensyduino Core Library:  If the Teensyduino Core Library or documentation is
+incorporated into a build system that allows selection among a list of target
+devices, then similar target devices manufactured by PJRC.com must be included
+in the list of target devices and selectable in the same manner.
 Texas Instruments: Your use of Texas Instruments Inc. WiLink8 Licensed Software
 is restricted to NXP SoC based systems that include a compatible connectivity
 device manufactured by TI.
@@ -744,3 +797,9 @@ upon notice.
 Vivante: Distribution of Vivante software must be a part of, or embedded
 within, Authorized Systems that include a Vivante Graphics Processing Unit.
+Wittenstein:  Your use of the SafeRTOS v9.x and Networking Stack, in object
+form, is limited to your internal testing, evaluation, feedback and development
+specifically for use with an NXP Product.  Licensee’s license to use and
+supply the software to you expires on June 25, 2026.  Further rights must be
+obtained directly from Wittenstein.
diff --git a/LICENSE b/LICENSE
index 17964fe56..b69284ffb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,12 +1,166 @@
-Different components of meta-freescale are under different licenses (a mix
+# License Information
-of MIT and proprietary). Please see:
-COPYING.MIT (MIT)
+This file lists all licenses used by recipes in the meta-freescale layer.
-custom-licenses/* (Various EULAs, included by recipes)
-All metadata is MIT licensed unless otherwise stated. Source code and binaries
+./dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb: LICENSE = "GPL-2.0-only"
-included in tree for individual recipes are under the LICENSE stated in
+./dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb: LICENSE = "BSD-3-Clause"
-the associated recipe (.bb file) unless otherwise stated.
+./dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb: LICENSE = "MIT"
+./recipes-bsp/atf/qoriq-atf-2.6.inc: LICENSE = "BSD-3-Clause"
-License information for any other files is either explicitly stated
+./recipes-bsp/boot-format/boot-format_git.bb: LICENSE = "GPL-2.0-only"
-or defaults to GPL version 2.
+./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-imx-8.27.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-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"
+./recipes-bsp/imx-mkimage/imx-mkimage_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb: LICENSE = "Proprietary"
+./recipes-bsp/imx-seco/imx-seco-libs_git.bb: LICENSE = "Proprietary"
+./recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb: LICENSE = "Proprietary"
+./recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-bsp/imx-test/imx-test_00.00.00.bb: LICENSE = "MIT"
+./recipes-bsp/imx-test/imx-test_git.bb: LICENSE = "GPL-2.0-or-later"
+./recipes-bsp/imx-uuc/imx-uuc_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb: LICENSE = "Proprietary"
+./recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb: LICENSE = "MIT"
+./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/isp-imx_4.2.2.25.1.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"
+./recipes-bsp/mxsldr/mxsldr_git.bb: LICENSE = "GPL-2.0-or-later"
+./recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb: LICENSE = "NXP-Binary-EULA"
+./recipes-bsp/qe-ucode/qe-ucode_git.bb: LICENSE = "NXP-Binary-EULA"
+./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/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"
+./recipes-devtools/devregs/devregs_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb: LICENSE = "LGPL-2.1-only"
+./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_git.bb: LICENSE = "BSD-3-Clause"
+./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-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"
+./recipes-dpaa/fm-ucode/fm-ucode_git.bb: LICENSE = "NXP-Binary-EULA"
+./recipes-dpaa/fmlib/fmlib_git.bb: LICENSE = "BSD-3-Clause & GPL-2.0-only"
+./recipes-dpaa2/aiopsl/aiopsl_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-dpaa2/dce/dce_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-dpaa2/management-complex/management-complex_10.39.0.bb: LICENSE = "NXP-Binary-EULA"
+./recipes-dpaa2/restool/restool_git.bb: LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
+./recipes-dpaa2/spc/spc_git.bb: LICENSE = "MIT"
+./recipes-extended/crconf/crconf_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-extended/dpdk/dpdk-20.11.inc: LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
+./recipes-extended/dpdk/dpdk_19.11-20.12.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
+./recipes-extended/jailhouse/jailhouse-imx_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-extended/libpkcs11/libpkcs11_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-extended/merge-files/merge-files_1.0.bb: LICENSE = "MIT"
+./recipes-extended/odp/odp.inc: LICENSE = "BSD-3-Clause"
+./recipes-extended/ofp/ofp_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb: LICENSE = "BSD"
+./recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb: LICENSE = "BSD"
+./recipes-extended/secure-obj/secure-obj.inc: LICENSE = "BSD-3-Clause"
+./recipes-extended/skmm-ep/skmm-ep_git.bb: LICENSE = "BSD & GPL-2.0-only"
+./recipes-extended/testfloat/testfloat_2a.bb: LICENSE = "TestFloat"
+./recipes-extended/tsntool/tsntool_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-fsl/images/fsl-image-mfgtool-initramfs.bb: LICENSE = "MIT"
+./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-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-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/mesa/mesa-etnaviv-env_0.1.bb: LICENSE = "MIT"
+./recipes-graphics/wayland/wayland-protocols_1.37.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/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-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-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"
+./recipes-kernel/linux/linux-imx-headers_6.12.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/linux/linux-imx.inc: LICENSE = "GPL-2.0-only"
+./recipes-kernel/linux/linux-qoriq.inc: LICENSE = "GPL-2.0-only"
+./recipes-kernel/skmm-host/skmm-host_git.bb: LICENSE = "BSD & GPL-2.0-or-later"
+./recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb: LICENSE = "Apache-2.0"
+./recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb: LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-3-Clause"
+./recipes-multimedia/alsa/imx-alsa-plugins_git.bb: LICENSE = "GPL-2.0-only"
+./recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb: LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & ISC & MIT & BSD-2-Clause & BSD-3-Clause & IJG"
+LICENSE:${PN} = "GPL-2.0-or-later"
+LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
+LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
+LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
+LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
+LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
+LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
+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-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"
+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-base_1.24.7.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-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"
+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-rtsp-server_1.24.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_1.24.7.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-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-opencl-converter/imx-opencl-converter_0.7.0.bb: LICENSE = "Proprietary"
+./recipes-multimedia/imx-parser/imx-parser_4.9.3.bb: LICENSE = "Proprietary"
+./recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb: LICENSE = "Proprietary"
+./recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb: LICENSE = "Proprietary"
+./recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb: LICENSE = "LGPL-2.1-only"
+./recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb: LICENSE = "LGPL-2.1-only"
+./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"
+./recipes-support/opencv/opencv_4.6.0.imx.bb: LICENSE = "Apache-2.0"
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 46b0f9c4f..54b25b3ac 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -59,6 +59,9 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V47 = "9135422c7a38dac21bf1f858
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48 = "db4762b09b6bda63da103963e6e081de"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49 = "2827219e81f28aba7c6a569f7c437fa7"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53 = "44a8052c384584ba09077e85a3d1654f"
+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_MD5SUMS = " \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
@@ -114,11 +117,14 @@ FSL_EULA_FILE_MD5SUMS = " \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53} \
+    ${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} \
 "
 # The checksum for the EULA in the layer
 FSL_EULA_FILE_MD5SUM ?= \
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53}"
+    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58}"
 LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
 LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
@@ -160,7 +166,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-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index 94b30c04e..df4ac5fbf 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -17,21 +17,21 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}"
 do_compile:prepend() {
        if [ "${SCMVERSION}" = "y" ]; then
                # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
+                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
+                        hash=${SRCREV_machine}
-                else
+                else
-                        hash=${SRCREV}
+                        hash=${SRCREV}
-                fi
+                fi
-                if [ "$hash" = "AUTOINC" ]; then
+                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
+                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
+                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
+                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
-                printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion
+                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
-        else
+        else
                printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
                printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
        fi
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 53c70a0b8..c3a13a255 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -27,7 +27,7 @@
 ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
-IMX_BOOT_CONTAINER_FIRMWARE_SOC = ""
+IMX_BOOT_CONTAINER_FIRMWARE_SOC ?= ""
 IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = " \
    signed_dp_imx8m.bin \
    signed_hdmi_imx8m.bin \
@@ -63,6 +63,9 @@ do_resolve_and_populate_binaries() {
                    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}/${config}/
+                    fi
                fi
            done
            unset  j
@@ -96,7 +99,7 @@ do_deploy:append() {
                    if [ ! -f "${DEPLOYDIR}/imx-boot" ]; then
                        ln -sf flash.bin-${MACHINE}-${type} flash.bin
                        ln -sf flash.bin-${MACHINE}-${type} imx-boot
+                        ln -sf flash.bin.tagged imx-boot.tagged
                    else
                        bbwarn "Use custom wks.in for $UBOOT_CONFIG = $type"
                    fi
diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index f07580dd2..975dd77c1 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -22,7 +22,9 @@ SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-contain
 SECO_FIRMWARE_NAME:mx8dx-generic-bsp  ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxl${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx91-generic-bsp   ?= "mx91${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx93-generic-bsp   ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95${IMX_SOC_REV_LOWER}-ahab-container.img"
 python () {
    if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
diff --git a/classes/uuu_bootloader_tag.bbclass b/classes/uuu_bootloader_tag.bbclass
index 87745660c..b41d22a92 100644
--- a/classes/uuu_bootloader_tag.bbclass
+++ b/classes/uuu_bootloader_tag.bbclass
@@ -1,12 +1,20 @@
-# Append a tag to the bootloader image used in the SD card image. The tag
+# Create a tagged boot partition file for the SD card image file. The tag
-# contains the size of the bootloader image so UUU can easily find the end of
+# contains the size of the boot partition image so UUU can easily find
-# the bootloader in the SD card image.
+# the end of it in the SD card image file.
+#
+# IMPORTANT: The tagged boot partition file should never be used directly with
+#            UUU, as it can cause UUU to hang.
+UUU_BOOTLOADER                 = "${UBOOT_BINARY}"
+UUU_BOOTLOADER:mx8-generic-bsp = "${@d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0' and 'imx-boot' or 'flash.bin'}"
+UUU_BOOTLOADER:mx9-generic-bsp = "${@d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0' and 'imx-boot' or 'flash.bin'}"
 do_deploy:append() {
    if [ "${UUU_BOOTLOADER}" != "" ]; then
-        cp ${DEPLOYDIR}/${UUU_BOOTLOADER}   ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED}
+        cp ${DEPLOYDIR}/${UUU_BOOTLOADER} \
-        cp ${DEPLOYDIR}/${UUU_BOOTLOADER}   ${DEPLOYDIR}/${UUU_BOOTLOADER_UNTAGGED}
+           ${DEPLOYDIR}/${UUU_BOOTLOADER}.tagged
-        ln -sf ${UUU_BOOTLOADER_TAGGED}     ${DEPLOYDIR}/${UUU_BOOTLOADER}
+        stat -L -cUUUBURNXXOEUZX7+A-XY5601QQWWZ%sEND \
-        stat -L -cUUUBURNXXOEUZX7+A-XY5601QQWWZ%sEND ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED} \
+             ${DEPLOYDIR}/${UUU_BOOTLOADER}.tagged \
-                                         >> ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED}
+             >> ${DEPLOYDIR}/${UUU_BOOTLOADER}.tagged
    fi
 }
diff --git a/conf/layer.conf b/conf/layer.conf
index ef4e3e6e6..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 = "kirkstone langdale mickledore nanbield scarthgap"
+LAYERSERIES_COMPAT_freescale-layer = "whinlatter"
 LAYERDEPENDS_freescale-layer = "core"
 # Add the Freescale-specific licenses into the metadata
@@ -52,6 +52,8 @@ BBFILES_DYNAMIC += " \
    \
    meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bbappend \
    \
+    arm-toolchain:${LAYERDIR}/dynamic-layers/arm-toolchain/*/*/*.bb \
+    \
    multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \
    multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \
    \
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 1ab1d9df8..c65bc9b91 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -21,6 +21,7 @@ KERNEL_DEVICETREE = " \
        nxp/imx/imx6qp-sabresd.dtb \
        nxp/imx/imx6qp-sabresd-hdcp.dtb \
        nxp/imx/imx6qp-sabresd-ldo.dtb \
+        nxp/imx/imx6qp-sabresd-pcie-ep.dtb \
        \
        nxp/imx/imx6q-sabresd-btwifi.dtb \
        nxp/imx/imx6q-sabresd.dtb \
@@ -28,12 +29,16 @@ KERNEL_DEVICETREE = " \
        nxp/imx/imx6q-sabresd-hdcp.dtb \
        nxp/imx/imx6q-sabresd-ldo.dtb \
        nxp/imx/imx6q-sabresd-uart.dtb \
+        nxp/imx/imx6q-sabresd-pcie.dtb \
+        nxp/imx/imx6q-sabresd-pcie-ep.dtb \
        \
        nxp/imx/imx6dl-sabresd-btwifi.dtb \
        nxp/imx/imx6dl-sabresd.dtb \
        nxp/imx/imx6dl-sabresd-enetirq.dtb \
        nxp/imx/imx6dl-sabresd-hdcp.dtb \
        nxp/imx/imx6dl-sabresd-ldo.dtb \
+        nxp/imx/imx6dl-sabresd-pcie.dtb \
+        nxp/imx/imx6dl-sabresd-pcie-ep.dtb \
 "
 KERNEL_DEVICETREE:use-mainline-bsp = " \
    nxp/imx/imx6qp-sabresd.dtb \
@@ -76,6 +81,6 @@ OPTEE_BIN_EXT = "6qsdb"
 SERIAL_CONSOLES = "115200;ttymxc0"
-MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k firmware-imx-epdc"
 MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index af196eab8..df022d635 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -34,5 +34,6 @@ OPTEE_BIN_EXT = "6slevk"
 SERIAL_CONSOLES = "115200;ttymxc0"
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc"
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 5a1dc666c..58fff6db0 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -30,9 +30,7 @@ OPTEE_BIN_EXT:imx6sllevk = "6sllevk"
 SERIAL_CONSOLES = "115200;ttymxc0"
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 # MESA DRI library
 XSERVER += "mesa-driver-swrast"
-PREFERRED_PROVIDER_u-boot = "u-boot-fslc"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fslc"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 8d597c551..d85c7ce74 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -45,3 +45,4 @@ SERIAL_CONSOLES = "115200;ttymxc0"
 MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 10c7b6fb4..3bab4f549 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -10,6 +10,7 @@ include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 KERNEL_DEVICETREE = " \
    nxp/imx/imx6ul-14x14-evk-btwifi.dtb \
@@ -26,7 +27,11 @@ KERNEL_DEVICETREE = " \
    nxp/imx/imx6ul-14x14-evk-reve-ecspi-slave.dtb \
    nxp/imx/imx6ul-14x14-evk-reve-emmc.dtb \
    nxp/imx/imx6ul-14x14-evk-reve-gpmi-weim.dtb \
+    nxp/imx/imx6ul-9x9-evk.dtb \
+    nxp/imx/imx6ul-9x9-evk-btwifi.dtb \
+    nxp/imx/imx6ul-9x9-evk-ldo.dtb \
 "
 KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6ul-14x14-evk.dtb"
 ### u-boot-fslc settings ###
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index f412c18de..4c1184a79 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -9,13 +9,20 @@ MACHINEOVERRIDES =. "mx6ull:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
+MACHINE_FIRMWARE:append = " firmware-imx-epdc"
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 KERNEL_DEVICETREE = " \
    nxp/imx/imx6ull-14x14-evk.dtb \
 "
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    nxp/imx/imx6ull-9x9-evk.dtb \
+    nxp/imx/imx6ull-9x9-evk-btwifi.dtb \
+    nxp/imx/imx6ull-9x9-evk-ldo.dtb \
+    nxp/imx/imx6ull-14x14-evk.dtb \
    nxp/imx/imx6ull-14x14-evk-btwifi.dtb \
    nxp/imx/imx6ull-14x14-evk-emmc.dtb \
    nxp/imx/imx6ull-14x14-evk-gpmi-weim.dtb \
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index c5fd91bf4..572434ae7 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -10,6 +10,7 @@ include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 KERNEL_DEVICETREE = " \
    nxp/imx/imx6ulz-14x14-evk.dtb \
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 4b4a60122..96942ebb2 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 KERNEL_DEVICETREE = "nxp/imx/imx7d-sdb.dtb"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
@@ -42,3 +43,10 @@ UBOOT_CONFIG[epdc]     = "mx7dsabresd_epdc_config"
 OPTEE_BIN_EXT = "7dsdb"
 XSERVER += "mesa-driver-swrast"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx7d_sabresd_m4_TCM_Pingpang.bin \
+    mcore-demos/imx7d_sabresd_m4_TCM_helloworld.bin \
+    mcore-demos/imx7d_sabresd_m4_TCM_mcctty.bin \
+"
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index 2e39a0c79..b5196e30b 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 KERNEL_DEVICETREE = " \
        nxp/imx/imx7ulp-evk.dtb \
@@ -43,3 +44,12 @@ OPTEE_BIN_EXT = "7ulp"
 # Set Serial console
 SERIAL_CONSOLES = "115200;ttyLP0"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx7ulp_m4_demo.img \
+    mcore-demos/imx7ulp_wireless_uart_bridge.img \
+    mcore-demos/imx7ulp_erpc_matrix_multiply_rpmsg_rtos_imxcm4.img \
+    mcore-demos/imx7ulp_rpmsg_lite_pingpong_rtos.img \
+    mcore-demos/imx7ulp_rpmsg_lite_str_echo_rtos.img \
+"
diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index de00b6f65..7d87010b4 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -14,7 +14,7 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"
 # NXP BSP can consume proprietary jailhouse and Broadcom drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 nxpwifi-all-sdio"
 KERNEL_DEVICETREE_BASENAME = "imx8mn-ddr3l-evk"
 KERNEL_DEVICETREE = " \
@@ -67,3 +67,11 @@ UBOOT_MAKE_TARGET:pn-u-boot-imx = ""
 IMX_BOOT_SEEK = "32"
 OPTEE_BIN_EXT = "8mnul"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx8mnddr3l_m7_TCM_hello_world.bin \
+    mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mnddr3l_m7_TCM_sai_low_power_audio.bin \
+"
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 39108716a..cc461a1aa 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -41,6 +41,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/imx8mp-evk-root.dtb \
    freescale/imx8mp-evk-rpmsg.dtb \
    freescale/imx8mp-evk-rpmsg-lpv.dtb \
+    freescale/imx8mp-evk-sof-pdm.dtb \
    freescale/imx8mp-evk-sof-wm8960.dtb \
    freescale/imx8mp-evk-spdif-lb.dtb \
    freescale/imx8mp-evk-usdhc1-m2.dtb \
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 92a436e54..ff56e386d 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -15,7 +15,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
 MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio"
-MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359 jailhouse nxpwifi-all-pcie nxpwifi-all-sdio"
 MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
@@ -98,3 +98,10 @@ OPTEE_BIN_EXT = "8mq"
 # Add additional firmware
 MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx8mq_m4_TCM_hello_world.bin \
+    mcore-demos/imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
+"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index 47cfde198..56ede4326 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -12,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
 IMX_DEFAULT_BSP = "nxp"
 MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
-MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio"
 # Don't include kernels in standard images
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -20,7 +20,7 @@ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
 LOADADDR = ""
 # We have to disable SERIAL_CONSOLE due to auto-serial-console
-SERIAL_CONSOLES = "115200;ttyAMA0"
+SERIAL_CONSOLES = "115200;ttyLP0"
 # we do not want to have getty running on tty1 as we run
 # auto-serial-console there
@@ -42,7 +42,6 @@ KERNEL_DEVICETREE = " \
    freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \
    freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
    freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/imx8qm-mek-ov5640.dtb \
    freescale/imx8qm-mek-pcie-ep.dtb \
    freescale/imx8qm-mek-rpmsg.dtb \
    freescale/imx8qm-mek-sof.dtb \
@@ -50,6 +49,37 @@ KERNEL_DEVICETREE = " \
    freescale/imx8qm-mek-sof-wm8960.dtb \
    freescale/imx8qm-mek-usd-wifi.dtb \
    freescale/imx8qm-mek-usdhc3-m2.dtb \
+    freescale/imx8qm-mek-max9286-csi0.dtb \
+    freescale/imx8qm-mek-max9286-csi1.dtb \
+    freescale/imx8qm-mek-max9286-dual.dtb \
+    freescale/imx8qm-mek-revd-ca53.dtb \
+    freescale/imx8qm-mek-revd-ca72.dtb \
+    freescale/imx8qm-mek-revd-dsi-rm67191.dtb \
+    freescale/imx8qm-mek-revd-dsi-rm67199.dtb \
+    freescale/imx8qm-mek-revd.dtb \
+    freescale/imx8qm-mek-revd-enet2-tja1100.dtb \
+    freescale/imx8qm-mek-revd-hdmi.dtb \
+    freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \
+    freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \
+    freescale/imx8qm-mek-revd-max9286-csi0.dtb \
+    freescale/imx8qm-mek-revd-max9286-csi1.dtb \
+    freescale/imx8qm-mek-revd-max9286-dual.dtb \
+    freescale/imx8qm-mek-revd-ov5640-csi0.dtb \
+    freescale/imx8qm-mek-revd-ov5640-csi1.dtb \
+    freescale/imx8qm-mek-revd-ov5640-dual.dtb \
+    freescale/imx8qm-mek-revd-pcie-ep.dtb \
+    freescale/imx8qm-mek-revd-root.dtb \
+    freescale/imx8qm-mek-revd-rpmsg.dtb \
+    freescale/imx8qm-mek-revd-sof-cs42888.dtb \
+    freescale/imx8qm-mek-revd-sof-wm8962.dtb \
+    freescale/imx8qm-mek-revd-usdhc3-m2.dtb \
+    freescale/imx8qm-mek-revd-usd-wifi.dtb \
+    freescale/imx8qm-mek-ov5640-csi0.dtb \
+    freescale/imx8qm-mek-ov5640-csi0-rpmsg.dtb \
+    freescale/imx8qm-mek-ov5640-csi1.dtb \
+    freescale/imx8qm-mek-ov5640-csi1-rpmsg.dtb \
+    freescale/imx8qm-mek-ov5640-dual.dtb \
+    freescale/imx8qm-mek-ov5640-dual-rpmsg.dtb \
 "
 UBOOT_MAKE_TARGET = \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 87df30f42..6763c985e 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -25,6 +25,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8962.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8qxp_mek"
diff --git a/conf/machine/imx8ulp-lpddr4-evk.conf b/conf/machine/imx8ulp-lpddr4-evk.conf
index 273e1569d..ad8362e64 100644
--- a/conf/machine/imx8ulp-lpddr4-evk.conf
+++ b/conf/machine/imx8ulp-lpddr4-evk.conf
@@ -18,10 +18,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-tpm.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8ulp_evk"
-MACHINE_FEATURES += "soc-reva1"
+MACHINE_FEATURES += "soc-reva2"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 UPOWER_FIRMWARE_NAME = "upower_a1.bin"
 IMX_DEFAULT_BSP = "nxp"
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index f8bdc4d7f..e7ad6d4d3 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -13,11 +13,11 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-i2c-spi-slave.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-iw612-otbr.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-ld.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
@@ -35,3 +35,13 @@ DDR_FIRMWARE_NAME = " \
    lpddr4_imem_1d_v202201.bin \
    lpddr4_imem_2d_v202201.bin \
 "
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx93-11x11-evk_m33_TCM_low_power_wakeword.bin \
+    mcore-demos/imx93-11x11-evk_m33_TCM_power_mode_switch.bin \
+    mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx93-11x11-evk_m33_TCM_sai_low_power_audio.bin \
+"
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index 975591042..dff843a79 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -13,13 +13,14 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-serdes.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lvds-it6263.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx93_14x14_evk"
-IMXBOOT_TARGETS_BASENAME = "flash_singleboot"
 DDR_FIRMWARE_NAME = " \
    lpddr4_dmem_1d_v202201.bin \
@@ -28,6 +29,9 @@ DDR_FIRMWARE_NAME = " \
    lpddr4_imem_2d_v202201.bin \
 "
-UBOOT_CONFIG[fspi]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
-IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"
+    mcore-demos/imx93-14x14-evk_m33_TCM_power_mode_switch.bin \
+    mcore-demos/imx93-14x14-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx93-14x14-evk_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
+"
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf
index 3ccd6fd77..ef53da5eb 100644
--- a/conf/machine/imx93-9x9-lpddr4-qsb.conf
+++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-tianma-wvga-panel.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb"
@@ -28,3 +29,12 @@ DDR_FIRMWARE_NAME = " \
    lpddr4_imem_1d_v202201.bin \
    lpddr4_imem_2d_v202201.bin \
 "
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx93-9x9-qsb_m33_TCM_power_mode_switch.bin \
+    mcore-demos/imx93-9x9-qsb_m33_TCM_low_power_wakeword.bin \
+    mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx93-9x9-qsb_m33_TCM_sai_low_power_audio.bin \
+"
diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf
new file mode 100644
index 000000000..38acc47da
--- /dev/null
+++ b/conf/machine/imx95-19x19-verdin.conf
@@ -0,0 +1,90 @@
+#@TYPE: Machine
+#@NAME: Toradex i.MX 95 19x19 Verdin Evaluation Kit
+#@SOC: i.MX95
+#@DESCRIPTION: Machine configuration for Toradex i.MX 95 19x19 Verdin Evaluation Ki
+#@MAINTAINER: Flora Hu <flora.hu@nxp.com>
+MACHINEOVERRIDES =. "mx95:"
+require conf/machine/include/imx95-evk.inc
+KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin"
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-combo.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-isp-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10-isp-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-combo.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-isp-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-isp-lvds-dual.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-lvds.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtbo \
+"
+UBOOT_CONFIG_BASENAME = "imx95_19x19_verdin"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd]    = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[fspi]  = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
+IMXBOOT_TARGETS = "flash_a55"
+IMXBOOT_TARGETS_BASENAME = "flash"
+OEI_BOARD  = "mx95lp5"
+DDR_TYPE   = "lpddr5"
+LPDDR_FW_VERSION = "_v202409"
+DDR_FIRMWARE_NAME = " \
+    lpddr5_dmem${LPDDR_FW_VERSION}.bin \
+    lpddr5_dmem_qb${LPDDR_FW_VERSION}.bin \
+    lpddr5_imem${LPDDR_FW_VERSION}.bin \
+    lpddr5_imem_qb${LPDDR_FW_VERSION}.bin \
+"
+IMXBOOT_VARIANT = ""
+M4_DEFAULT_IMAGE_MX95:imx-nxp-bsp = "imx95-verdin-evk_m7_TCM_power_mode_switch.bin"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx95-verdin-evk_m7_TCM_power_mode_switch.bin \
+    mcore-demos/imx95-verdin-evk_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx95-verdin-evk_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx95-verdin-evk_m7_TCM_sai_low_power_audio.bin \
+    ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \
+"
+#IMXBOOT_VARIANT = ""
+# The System Manager Firmware Name corresponds to a particular binary implementation
+# in the Yocto deploy folder. The name is comprised of the Firmware Basename and the
+# default system manager Config name, e.g., m33_image-mx95evk.bin and
+# m33_image-mx95evk_fusa.bin for the standard BSP version and FuSa version, respectively
+# The System Manager Firmware Basename is an alias used by imx-boot instead of using
+# a unique name for each implementation, e.g., m33_image.bin for i.MX 95
+SYSTEM_MANAGER_FIRMWARE_BASENAME ?= "m33_image"
+SYSTEM_MANAGER_FIRMWARE_NAME     ?= "m33_image-mx95evk"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d1f8aca32..15d7b2e8d 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -75,9 +75,9 @@ UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
 # wic based images.
 SPL_BINARY ??= "${@get_spl_binary(d)}"
-PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
-PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}"
 PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
+PREFERRED_PROVIDER_u-boot ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
+PREFERRED_PROVIDER_u-boot-mfgtool ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
 PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
@@ -94,6 +94,7 @@ UBOOT_ENTRYPOINT:mx6ulz-generic-bsp ?= "0x80008000"
 UBOOT_ENTRYPOINT:mx7-generic-bsp    ?= "0x80008000"
 UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000"
 UBOOT_ENTRYPOINT:mx8m-generic-bsp   ?= "0x40480000"
+UBOOT_ENTRYPOINT:mx93-generic-bsp   ?= "0x80400000"
 UBOOT_ENTRYPOINT:vf-generic-bsp     ?= "0x80008000"
 # Some SoC can utilize the boot container provided by U-Boot,
@@ -129,6 +130,7 @@ IMX_DEFAULT_ATF_PROVIDER ??= "imx-atf"
 SOC_ATF_BOOT_UART_BASE                    = ""
 SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp   = "0x30890000"
+SOC_ATF_BOOT_UART_BASE:mx8mq-generic-bsp  = "0x30860000"
 ATF_BOOT_UART_BASE                       ?= "${SOC_ATF_BOOT_UART_BASE}"
 PREFERRED_PROVIDER_virtual/xserver      = "xserver-xorg"
@@ -165,7 +167,9 @@ DEFAULTTUNE:mx8m-generic-bsp   ?= "cortexa53-crypto"
 DEFAULTTUNE:mx8qm-generic-bsp  ?= "cortexa72-cortexa53-crypto"
 DEFAULTTUNE:mx8x-generic-bsp   ?= "cortexa35-crypto"
 DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto"
+DEFAULTTUNE:mx91-generic-bsp   ?= "cortexa55"
 DEFAULTTUNE:mx93-generic-bsp   ?= "cortexa55"
+DEFAULTTUNE:mx95-generic-bsp   ?= "cortexa55"
 INHERIT += "machine-overrides-extender"
@@ -189,12 +193,12 @@ IMX_SOC_REV_UPPER   = "${@d.getVar('IMX_SOC_REV').upper()}"
 ### NXP BSP specific overrides
 #######
-MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp   = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp   = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp"
@@ -202,25 +206,27 @@ MACHINEOVERRIDES_EXTENDER:mx6ull:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxf
 MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp   = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp     = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8mnul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mnul-generic-bsp:mx8mnul-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-generic-bsp:mx8dxl-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp"
 #######
 ### Mainline BSP specific overrides
@@ -263,7 +269,9 @@ MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainlin
 MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-mainline-bsp"
+MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp"
+MACHINEOVERRIDES_EXTENDER:mx95:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx95-generic-bsp:mx95-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
    mx6 \
@@ -294,7 +302,9 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
    mx8dx \
    mx8dxl \
    mx8ulp \
+    mx91 \
    mx93 \
+    mx95 \
 "
 MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR = "%s overrides cannot be used and need conversion to use the new BSP-specific overrides. Check 'meta-freescale/scripts/convert-bsp-specific-overrides'."
@@ -305,7 +315,7 @@ MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl"
 MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl"
 MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx"
 MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl"
-MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll"
+MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp = "-mx6sll"
 MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d"
 MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp"
 MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf"
@@ -322,7 +332,9 @@ MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp  = "-mx8"
 MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp   = "-mx8"
 MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp  = "-mx8xl"
 MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp  = "-mx8ulp"
+MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp    = "-mx91"
 MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp    = "-mx93"
+MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp    = "-mx95"
 # For Mainline we use a single SoC suffix as we don't have different build options
 MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx"
@@ -399,7 +411,11 @@ IMX_EXTRA_FIRMWARE:mx8-generic-bsp    = "imx-boot-firmware-files imx-sc-firmware
 IMX_EXTRA_FIRMWARE:mx8m-generic-bsp   = "imx-boot-firmware-files"
 IMX_EXTRA_FIRMWARE:mx8x-generic-bsp   = "imx-sc-firmware imx-seco"
 IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx"
+IMX_EXTRA_FIRMWARE:mx91-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
 IMX_EXTRA_FIRMWARE:mx93-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
+PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager"
+PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei"
+IMX_EXTRA_FIRMWARE:mx95-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
 # Firmware
 MACHINE_FIRMWARE ?= ""
@@ -420,6 +436,7 @@ MACHINE_FIRMWARE:append:mx8mp-generic-bsp    = " linux-firmware-imx-sdma-imx7d f
 MACHINE_FIRMWARE:append:mx8mq-generic-bsp    = " linux-firmware-imx-sdma-imx7d"
 MACHINE_FIRMWARE:append:mx8qxp-generic-bsp   = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
 MACHINE_FIRMWARE:append:mx8dx-generic-bsp    = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
+MACHINE_FIRMWARE:append:mx95-generic-bsp     = " firmware-imx-vpu-wave"
 MACHINE_FIRMWARE:append:imx-mainline-bsp     = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
@@ -510,14 +527,30 @@ 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.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp              ??= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp              ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.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-examples:mx8-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp       ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp        ??= "1.24.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"
@@ -532,67 +565,62 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1"
 #   1 - machine has Vivante GPU driver support
 MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}"
-# Graphics libraries
+# Override graphics for i.MX GPU
-PREFERRED_PROVIDER_virtual/egl      ?= "mesa"
+IMXGPU_GRAPHICS_PROVIDER:imxviv  ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/libgl    ?= "mesa"
+IMXGPU_GRAPHICS_PROVIDER:imxmali ?= "mali-imx"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/egl:imxgpu          ?= "${IMXGPU_GRAPHICS_PROVIDER}"
+PREFERRED_PROVIDER_virtual/libgl:imxgpu        ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/egl:imxgpu        ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/mesa:imxgpu         ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/libgl:imxgpu      ?= "mesa-gl"
+PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d   ?= "${IMXGPU_GRAPHICS_PROVIDER}"
-PREFERRED_PROVIDER_virtual/mesa:imxgpu       ?= "mesa-gl"
+PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d   ?= "${IMXGPU_GRAPHICS_PROVIDER}"
-PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d   ?= "${IMXGPU_GRAPHICS_PROVIDER}"
-PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv"
+# The Vivante OpenCL implementation doesn't work with the standard headers and loader
-PREFERRED_PROVIDER_virtual/libg2d            ?= "imx-gpu-g2d"
+PREFERRED_PROVIDER_opencl-clhpp:imxviv         ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/libg2d:imxdpu     ?= "imx-dpu-g2d"
+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/libg2d              ?= "imx-gpu-g2d"
+PREFERRED_PROVIDER_virtual/libg2d:imxdpu       ?= "imx-dpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
-PREFERRED_PROVIDER_opencl-clhpp:imxgpu       ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_opencl-headers:imxgpu     ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_opencl-icd-loader:imxgpu  ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv"
-PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "12.0.3.imx"
+PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "14.0.1.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:mx6-nxp-bsp  ??= "1.32.imx"
+PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp  ??= "1.37.imx"
-PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp  ??= "1.32.imx"
-PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp  ??= "1.32.imx"
-PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp  ??= "1.32.imx"
-PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
+PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx"
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.116.imx"
+PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx"
-PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx"
-PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx"
+PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.275.0.imx"
-PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx"
+PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.275.0.imx"
-PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.261.1.imx"
+PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.275.0.imx"
-PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.261.1.imx"
+PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.275.0.imx"
-PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.261.1.imx"
+PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
-PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx"
 # Use i.MX optee Version
-PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "4.4.0.imx"
-PREFERRED_VERSION_optee-os:mx9-nxp-bsp     ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os:mx9-nxp-bsp     ??= "4.4.0.imx"
-PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx"
-PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx"
-PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "4.4.0.imx"
-PREFERRED_VERSION_optee-test:mx9-nxp-bsp   ??= "4.0.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"
 PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx"
 # Handle default kernel
-IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc"
+IMX_DEFAULT_KERNEL:imx-mainline-bsp ??= "linux-fslc"
-IMX_DEFAULT_KERNEL:imx-nxp-bsp      = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:imx-nxp-bsp      ??= "linux-fslc-imx"
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
@@ -611,7 +639,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 IMAGE_BOOT_FILES ?= " \
    ${KERNEL_IMAGETYPE} \
-    ${@make_dtb_boot_files(d)} \
+    ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${@make_dtb_boot_files(d)}', d)} \
    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \
 "
@@ -645,9 +673,9 @@ WKS_FILE_DEPENDS:append:imx-generic-bsp:mx9-generic-bsp = " \
    ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \
 "
-SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE                 ?= "imx-uboot-bootpart.wks.in"
-SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in"
 SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in"
 SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in"
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 0f9aa1f08..4f5d12986 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -6,7 +6,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
 MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
-MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 dpdk nxpwifi-all-sdio"
 # Don't include kernels in standard images
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 442f44778..516dd8a9d 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -16,7 +16,7 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
 # and pin it to NXP BSP only
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 dpdk nxpwifi-all-sdio"
 KERNEL_DEVICETREE = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
@@ -73,3 +73,13 @@ TEE_LOAD_ADDR = "0xbe000000"
 # Add additional firmware
 MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx8mm_m4_TCM_hello_world.bin \
+    mcore-demos/imx8mm_m4_TCM_low_power_wakeword.bin \
+    mcore-demos/imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mm_m4_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx8mm_m4_TCM_sai_low_power_audio_wm8524.bin \
+"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 11657bcce..a51f11edb 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
 MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 # NXP BSP can consume proprietary jailhouse and Broadcom drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
@@ -82,3 +83,11 @@ TEE_LOAD_ADDR = "0x56000000"
 # Add additional firmware
 MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx8mn_m7_TCM_hello_world.bin \
+    mcore-demos/imx8mn_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mn_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mn_m7_TCM_sai_low_power_audio.bin \
+"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 24e5588f1..d6ae21d55 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -13,7 +13,7 @@ MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie n
 # NXP BSP can consume proprietary jailhouse and Marvell drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997 nxpwifi-all-pcie nxpwifi-all-sdio dpdk"
 # Mainline kernel contains only one DTB file for
 # imx8mpevk machine
@@ -72,3 +72,12 @@ TEE_LOAD_ADDR = "0x56000000"
 # Add additional firmware
 MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx8mp_m7_TCM_hello_world.bin \
+    mcore-demos/imx8mp_m7_TCM_low_power_wakeword.bin \
+    mcore-demos/imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mp_m7_TCM_sai_low_power_audio.bin \
+"
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index 9eaa77c53..e83085860 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -4,7 +4,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
 MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
-MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio"
 # Don't include kernels in standard images
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -12,7 +12,7 @@ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
 LOADADDR = ""
 # We have to disable SERIAL_CONSOLE due to auto-serial-console
-SERIAL_CONSOLES = "115200;ttyAMA0"
+SERIAL_CONSOLES = "115200;ttyLP0"
 # we do not want to have getty running on tty1 as we run
 # auto-serial-console there
@@ -33,8 +33,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
 "
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index 3a9222820..e5a3f0e22 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -4,7 +4,9 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
 MACHINE_FEATURES += "pci wifi bluetooth"
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio dpdk nxpwifi-all-sdio"
+MACHINE_FIRMWARE:append:use-nxp-bsp = " ethos-u-firmware"
 KERNEL_DEVICETREE = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
@@ -23,12 +25,24 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
 UBOOT_CONFIG[ecc]  = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
-UBOOT_CONFIG[ld]   = "${UBOOT_CONFIG_BASENAME}_ld_defconfig"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 # Set ATF platform name
 ATF_PLATFORM = "imx93"
-IMXBOOT_TARGETS = "flash_singleboot"
+IMXBOOT_TARGETS = \
+    "${@bb.utils.contains('UBOOT_CONFIG',   'sd', '${IMXBOOT_TARGETS_SD}', \
+        bb.utils.contains('UBOOT_CONFIG',  'ecc', '${IMXBOOT_TARGETS_ECC}', \
+        bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \
+                                                  'INVALID', d), d), d)}"
+# Note different SD targets for different Glitch Detection (GDET) modes:
+# | Target                     | Glitch Detection                                 |
+# | flash_singleboot           | None                                             |
+# | flash_singleboot_gdet      | Enabled                                          |
+# | flash_singleboot_gdet_auto | Enabled during EdgeLock Secure Enclave API calls |
+IMXBOOT_TARGETS_SD   = "flash_singleboot flash_singleboot_gdet flash_singleboot_gdet_auto"
+IMXBOOT_TARGETS_ECC  = "flash_singleboot"
+IMXBOOT_TARGETS_FSPI = "flash_singleboot_flexspi"
 IMX_BOOT_SOC_TARGET = "iMX9"
 IMX_BOOT_SEEK = "32"
diff --git a/conf/machine/include/imx95-evk.inc b/conf/machine/include/imx95-evk.inc
new file mode 100644
index 000000000..d78745cfc
--- /dev/null
+++ b/conf/machine/include/imx95-evk.inc
@@ -0,0 +1,58 @@
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
+MACHINE_FEATURES += "pci wifi bluetooth optee"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-pcie nxpwifi-all-sdio jailhouse dpdk xen"
+KERNEL_DEVICETREE = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
+"
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+SPL_BINARY = "spl/u-boot-spl.bin"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_evk_defconfig,sdcard"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_evk_fspi_defconfig"
+ATF_PLATFORM = "imx95"
+OEI_CONFIGS = "ddr tcm"
+OEI_CORE   = "m33"
+OEI_SOC    = "mx95"
+OEI_BOARD  ?= "mx95lp5"
+DDR_TYPE   ?= "lpddr5"
+IMXBOOT_VARIANTS = "alt jailhouse netc sof"
+# Multiple system manager configs by IMXBOOT_VARIANT
+SYSTEM_MANAGER_CONFIG = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       'mx95alt', \
+                            bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', 'mx95evkjailhouse', \
+                            bb.utils.contains('IMXBOOT_VARIANT', 'netc',      'mx95netc', \
+                            bb.utils.contains('IMXBOOT_VARIANT', 'sof',       'mx95evksof', \
+                                                                              'mx95evk', d), d), d), d)}"
+# imx-boot (flash.bin) targets based on UBOOT_CONFIG and IMXBOOT_VARIANT
+IMXBOOT_TARGETS_SD = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       '${IMXBOOT_TARGETS_BASENAME}_alt', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', '${IMXBOOT_TARGETS_BASENAME}_jailhouse', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'netc',      '${IMXBOOT_TARGETS_BASENAME}_netc', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'sof',       '${IMXBOOT_TARGETS_BASENAME}_a55', \
+                                                                           '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d)} \
+"
+IMXBOOT_TARGETS = " \
+    ${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_a55_flexspi', '${IMXBOOT_TARGETS_SD}', d)} \
+"
+IMX_BOOT_SOC_TARGET = "iMX95"
+IMX_BOOT_SEEK = "32"
+# We have to disable SERIAL_CONSOLE due to auto-serial-console
+SERIAL_CONSOLES = "115200;ttyLP0"
+IMX_DEFAULT_BSP = "nxp"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 4340c9423..4a42a8bd3 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -43,6 +43,8 @@ EXTRA_IMAGEDEPENDS += "u-boot qoriq-cst-native"
 MACHINEOVERRIDES =. "qoriq:"
+INHERIT += "machine-overrides-extender"
 # Machines or distros can define which BSP it should use by default. We are
 # intending to default for nxp BSP by default and specific machines or
 # DISTROs might change it if need.
@@ -51,6 +53,8 @@ MACHINEOVERRIDES =. "qoriq:"
 QORIQ_DEFAULT_BSP ?= "nxp"
 MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:"
+MACHINEOVERRIDES_EXTENDER:use-mainline-bsp = "qoriq-generic-bsp:qoriq-mainline-bsp"
+MACHINEOVERRIDES_EXTENDER:use-nxp-bsp = "qoriq-generic-bsp:qoriq-nxp-bsp"
 # Sub-architecture support
 MACHINE_SOCARCH_SUFFIX ?= ""
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_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
new file mode 100644
index 000000000..df704dc99
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
@@ -0,0 +1,59 @@
+SUMMARY = "i.MX Optional Execution Image"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552"
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "gcc-arm-none-eabi-native"
+SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}"
+IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
+SRCBRANCH = "master"
+SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678"
+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)"
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
new file mode 100644
index 000000000..d8033622c
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -0,0 +1,44 @@
+# Set generic compiler for system manager core
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "${SM_COMPILER}"
+SM_COMPILER ?= "gcc-arm-none-eabi-native"
+PROVIDES += "virtual/imx-system-manager"
+inherit deploy
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Set monitor mode for none, one, or two
+PACKAGECONFIG[m0] = "M=0,,,,,m1 m2"
+PACKAGECONFIG[m1] = ",,,,,m0 m2"
+PACKAGECONFIG[m2] = "M=2,,,,,m0 m1"
+SYSTEM_MANAGER_CONFIG ?= "INVALID"
+LDFLAGS[unexport] = "1"
+EXTRA_OEMAKE = " \
+    V=y \
+    SM_CROSS_COMPILE=arm-none-eabi- \
+    ${PACKAGECONFIG_CONFARGS} \
+"
+do_configure() {
+    oe_runmake config=${SYSTEM_MANAGER_CONFIG} clean
+    oe_runmake config=${SYSTEM_MANAGER_CONFIG} cfg
+}
+do_compile() {
+    oe_runmake config=${SYSTEM_MANAGER_CONFIG}
+}
+do_install[noexec] = "1"
+addtask deploy after do_compile
+do_deploy() {
+    install -D -p -m 0644 \
+        ${B}/build/${SYSTEM_MANAGER_CONFIG}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
+        ${DEPLOYDIR}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}.bin
+}
+COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
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
new file mode 100644
index 000000000..55826b016
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
@@ -0,0 +1,21 @@
+SUMMARY = "i.MX System Manager Firmware"
+DESCRIPTION = "\
+The System Manager (SM) is a firmware that runs on a Cortex-M processor on \
+many NXP i.MX processors. The Cortex-M is the boot core, runs the boot ROM \
+which loads the SM (and other boot code), and then branches to the SM. The \
+SM then configures some aspects of the hardware such as isolation mechanisms \
+and then starts other cores in the system. After starting these cores, it \
+enters a service mode where it provides access to clocking, power, sensor, \
+and pin control via a client RPC API based on ARM's System Control and \
+Management Interface (SCMI)."
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b66f32a90f9577a5a3255c21d79bc619"
+SRC_URI = "${IMX_SYSTEM_MANAGER_SRC};branch=${SRCBRANCH}"
+IMX_SYSTEM_MANAGER_SRC ?= "git://github.com/nxp-imx/imx-sm.git;protocol=https"
+SRCBRANCH = "master"
+SRCREV = "709deccd9338399eb39b5cf99a60eab4fa60d539"
+require imx-system-manager.inc
+PACKAGECONFIG ??= "m2"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
deleted file mode 100644
index b77fbc838..000000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-DEPENDS:append:imxvpu = " imx-vpuwrap"
-# Additional imx code and patches are included in the chromium-imx git repository.
-# The code below fetches this repository, copies the extra source over to the main
-# chromium source directory, and applies the patches.
-CHROMIUM_IMX_BRANCH ?= "master"
-CHROMIUM_IMX_SRCREV ?= "HEAD"
-CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git"
-PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches"
-CHROMIUM_IMX_COMMON_PATCHES ?= " "
-CHROMIUM_IMX_VPU_PATCHES ?= " "
-CHROMIUM_IMX_WAYLAND_PATCHES ?= " "
-SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https"
-do_unpack[postfuncs] += "copy_chromium_imx_files"
-# using =+ instead of += to make sure add_chromium_imx_patches is
-# executed before add_ozone_wayland_patches in the main recipe;
-# this is necessary because add_chromium_imx_patches appends
-# patches to the OZONE_WAYLAND_EXTRA_PATCHES variable
-do_patch[prefuncs] =+ "add_chromium_imx_patches"
-# * Lost context problems are not known to happen with Vivante GPUs,
-#   so it is safe to use ignore-lost-context
-# * Proprietary codecs need to be enabled for h.264 and MP4 support
-PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs"
-copy_chromium_imx_files() {
-        # sources in src/ are already organized in a manner
-        # that matches the subdirectories in the chromium
-        # source directory; just copy over the files in src/
-        cp -r ${WORKDIR}/chromium-imx-git/src/* ${S}/
-}
-python add_chromium_imx_patches() {
-    d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_COMMON_PATCHES', 1))
-    d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_VPU_PATCHES', 1))
-    d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1))
-}
-COMPATIBLE_MACHINE = "(mx6-nxp-bsp)"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
deleted file mode 100644
index 0329d42e4..000000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h
--- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500
-+++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h     2016-05-27 11:49:53.000000000 -0500
-@@ -36,7 +36,7 @@
- extern "C" {
- #endif
- 
-#include <va/va.h>
-+#include <libva/va/va.h>
- 
- /**
-  * \defgroup api_dec_jpeg JPEG decoding API
-diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h chromium-48.0.2548.0/third_party/libva/va/va.h
--- chromium-48.0.2548.0_org/third_party/libva/va/va.h  2016-05-27 11:45:31.248306710 -0500
-+++ chromium-48.0.2548.0/third_party/libva/va/va.h      2016-05-27 11:49:16.000000000 -0500
-@@ -80,7 +80,7 @@
- 
- #include <stddef.h>
- #include <stdint.h>
-#include <va/va_version.h>
-+#include <libva/va/va_version.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -2836,16 +2836,16 @@
-  */
- #define VA_PICTURE_HEVC_RPS_LT_CURR             0x00000040
- 
-#include <va/va_dec_hevc.h>
-#include <va/va_dec_jpeg.h>
-#include <va/va_dec_vp8.h>
-#include <va/va_dec_vp9.h>
-#include <va/va_enc_hevc.h>
-#include <va/va_enc_h264.h>
-#include <va/va_enc_jpeg.h>
-#include <va/va_enc_mpeg2.h>
-#include <va/va_enc_vp8.h>
-#include <va/va_vpp.h>
-+#include <libva/va/va_dec_hevc.h>
-+#include <libva/va/va_dec_jpeg.h>
-+#include <libva/va/va_dec_vp8.h>
-+#include <libva/va/va_dec_vp9.h>
-+#include <libva/va/va_enc_hevc.h>
-+#include <libva/va/va_enc_h264.h>
-+#include <libva/va/va_enc_jpeg.h>
-+#include <libva/va/va_enc_mpeg2.h>
-+#include <libva/va/va_enc_vp8.h>
-+#include <libva/va/va_vpp.h>
- 
- /**@}*/
- 
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index 7d84ee93a..1b527fc69 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -6,8 +6,10 @@ SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable"
 DEPENDS:append:mx95-nxp-bsp = " libdrm"
-PACKAGECONFIG:remove:mx95-nxp-bsp = "libcamera"
+PACKAGECONFIG:remove:mx6-nxp-bsp = "gstreamer"
-PACKAGECONFIG:remove:imx-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-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
index 4cfa51ea9..dfedc062e 100644
--- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -1,4 +1,5 @@
-# Only _mx8 machine do provide virtual/libgbm required for any drm* flavour
+# 6 and 7 Vivante do not provide virtual/libgbm required for any drm* flavour
-DRM-REMOVE:imxgpu = "drm-gl drm-gles2"
+DRM-REMOVE                    = ""
-DRM-REMOVE:imxgpu:mx8-nxp-bsp = ""
+DRM-REMOVE:imxgpu:mx6-nxp-bsp = "drm-gl drm-gles2"
+DRM-REMOVE:imxgpu:mx7-nxp-bsp = "drm-gl drm-gles2"
 PACKAGECONFIG:remove = "${DRM-REMOVE}"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch
deleted file mode 100644
index a3f5c8288..000000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-NXP uses weaken to solve conflict in linking.
-On Ubuntu 22.04(LTS) this fails to link cst with libcrypto.
-The patch fixes the conflict in the code itself.
-It restricts the scope of err_msg to the module.
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com>
----
-diff --git a/code/cst/code/build/make/rules.mk b/code/cst/code/build/make/rules.mk
-index 1c0842b..9c46cc4 100644
--- a/code/cst/code/build/make/rules.mk
-+++ b/code/cst/code/build/make/rules.mk
-@@ -25,11 +25,11 @@ LFLAGS  := -t
- %.a:
-        @echo "Create archive $@"
-        $(AR) $(ARFLAGS) $@ $^
-ifneq ($(OSTYPE),mingw32)
-ifneq ($(OSTYPE),osx)
-       $(OBJCOPY) --weaken $@
-endif
-endif
-+#ifneq ($(OSTYPE),mingw32)
-+#ifneq ($(OSTYPE),osx)
-+#      $(OBJCOPY) --weaken $@
-+#endif
-+#endif
- 
- %.exe:
-        @echo "Link $@"
-diff --git a/code/cst/code/front_end/src/acst.c b/code/cst/code/front_end/src/acst.c
-index fb1e8aa..1e993ee 100644
--- a/code/cst/code/front_end/src/acst.c
-+++ b/code/cst/code/front_end/src/acst.c
-@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- /*===========================================================================
-                             LOCAL VARIABLES
- =============================================================================*/
-char err_msg[MAX_ERR_MSG_BYTES];
-+static char err_msg[MAX_ERR_MSG_BYTES];
- 
- /*===========================================================================
-                             LOCAL FUNCTION PROTOTYPES
-diff --git a/code/cst/code/front_end/src/misc_helper.c b/code/cst/code/front_end/src/misc_helper.c
-index 678dc17..9014b2a 100644
--- a/code/cst/code/front_end/src/misc_helper.c
-+++ b/code/cst/code/front_end/src/misc_helper.c
-@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- /*===========================================================================
-                             LOCAL VARIABLES
- =============================================================================*/
-char err_msg[MAX_ERR_MSG_BYTES];
-+static char err_msg[MAX_ERR_MSG_BYTES];
- 
- /*===========================================================================
-                             LOCAL FUNCTION PROTOTYPES
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb
deleted file mode 100644
index 5f808a974..000000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "i.MX code signing tool"
-DESCRIPTION = "Provides software code signing support designed that integrate the HABv4 and AHAB library"
-SECTION = "cst"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.bsd3;md5=1fbcd66ae51447aa94da10cbf6271530"
-DEPENDS = "byacc-native flex-native openssl"
-# tag=debian/3.3.1+dfsg-2
-SRCREV = "e2c687a856e6670e753147aacef42d0a3c07891a"
-SRC_URI = " \
-    file://0001-fix-err-msg-linking.patch \
-    git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre \
-"
-S = "${WORKDIR}/git"
-EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"'
-do_compile() {
-    cd ${S}/code/cst
-    oe_runmake build OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}"
-    cd -
-    oe_runmake -C code/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-do_install () {
-    install -d ${D}${bindir}
-    install -m 755 ${S}/code/cst/code/obj.linux64/cst ${D}${bindir}
-    install -m 755 ${S}/code/cst/code/obj.linux64/srktool ${D}${bindir}
-    install -m 755 ${S}/code/hab_csf_parser/csf_parser ${D}${bindir}
-}
-BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch
deleted file mode 100644
index b9f17f4e3..000000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Upstream-Status: Unknown
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-libluajit is having symbols that can't be
-resolved the reloc cannot accommodate an offset greater than 24 bits.
-Looking at libluajit with readelf -r, you see a bunch of entries that look like:
-        000082f0  00003c0a R_PPC_REL24       00000000   sqrt + 0
-These should not occur when the code is compiled and linked with -fPIC.
-It turns out that libluajit *is* compiled and linked with -fPIC, however...
-There is one assembler file called lj_vm.s which is generated during the build.
-This file is missing the `@plt' qualifier from external references.
-This file is generated by a program called buildvm.  This in turn uses tables
-in a file called buildvm_arch.h which is generated by dynasm.lua.
-Index: LuaJIT-2.0.1/src/host/buildvm.c
-===================================================================
--- LuaJIT-2.0.1.orig/src/host/buildvm.c        2013-02-19 12:15:00.000000000 -0800
-+++ LuaJIT-2.0.1/src/host/buildvm.c     2013-05-14 20:26:05.933444512 -0700
-@@ -107,12 +107,14 @@
- #endif
-   sprintf(name, "%s%s%s", symprefix, prefix, suffix);
-   p = strchr(name, '@');
-+#if 0
-   if (p) {
-     if (!LJ_64 && (ctx->mode == BUILD_coffasm || ctx->mode == BUILD_peobj))
-       name[0] = '@';
-     else
-       *p = '\0';
-   }
-+#endif
-   p = (char *)malloc(strlen(name)+1);  /* MSVC doesn't like strdup. */
-   strcpy(p, name);
-   return p;
-Index: LuaJIT-2.0.1/src/vm_ppcspe.dasc
-===================================================================
--- LuaJIT-2.0.1.orig/src/vm_ppcspe.dasc        2013-02-19 12:15:00.000000000 -0800
-+++ LuaJIT-2.0.1/src/vm_ppcspe.dasc     2013-05-14 20:26:05.937444512 -0700
-@@ -1390,7 +1390,7 @@
-   |  checknum CARG2
-   |   evmergehi CARG1, CARG2, CARG2
-   |  checkfail ->fff_fallback
-  |  bl extern func
-+  |  bl extern func@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |.endmacro
-@@ -1405,7 +1405,7 @@
-   |  checknum CARG1
-   |   evmergehi CARG3, CARG4, CARG4
-   |  checkanyfail ->fff_fallback
-  |  bl extern func
-+  |  bl extern func@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |.endmacro
-@@ -1437,7 +1437,7 @@
-   |  checknum CARG2
-   |   evmergehi CARG1, CARG2, CARG2
-   |  checkfail ->fff_fallback
-  |  bl extern log
-+  |  bl extern log@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |
-@@ -1471,7 +1471,7 @@
-   |  checknum CARG1
-   |  checkanyfail ->fff_fallback
-   |  efdctsi CARG3, CARG4
-  |  bl extern ldexp
-+  |  bl extern ldexp@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |
-@@ -1484,7 +1484,7 @@
-   |  checkfail ->fff_fallback
-   |  la CARG3, DISPATCH_GL(tmptv)(DISPATCH)
-   |   lwz PC, FRAME_PC(BASE)
-  |  bl extern frexp
-+  |  bl extern frexp@plt
-   |   lwz TMP1, DISPATCH_GL(tmptv)(DISPATCH)
-   |  evmergelo CRET1, CRET1, CRET2
-   |   efdcfsi CRET2, TMP1
-@@ -1503,7 +1503,7 @@
-   |  checkfail ->fff_fallback
-   |  la CARG3, -8(BASE)
-   |   lwz PC, FRAME_PC(BASE)
-  |  bl extern modf
-+  |  bl extern modf@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |   la RA, -8(BASE)
-   |  evstdd CRET1, 0(BASE)
-@@ -2399,7 +2399,7 @@
-     |  checknum CARG1
-     |   evmergehi CARG3, CARG4, CARG4
-     |  checkanyfail ->vmeta_arith_vv
-    |  bl extern pow
-+    |  bl extern pow@plt
-     |  evmergelo CRET2, CRET1, CRET2
-     |  evstddx CRET2, BASE, RA
-     |  ins_next
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend
deleted file mode 100644
index d07f8ae14..000000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch "
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
index 62a717721..227b6291b 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
@@ -7,9 +7,7 @@ PR = "r2"
 DEPENDS = "libxml2 fmlib tclap"
 SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1"
-SRCREV = "63c8ac99899a9bcd723801579b4d786594670455"
+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" \
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch
deleted file mode 100644
index 283a081ba..000000000
--- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8ad045e5e664fe2d1bd9f88616d5bf83437aab4e Mon Sep 17 00:00:00 2001
-From: Yang Dong <b56112@freescale.com>
-Date: Wed, 9 Sep 2015 13:08:57 +0800
-Subject: [PATCH] xserver-common: enable iglx module
-Enable iglx module to pass indirect glx rendering test case.
-Upstream-Status: Inappropriate [imx specific]
-Date: Sep 9, 2015
-Signed-off-by Yang Dong <b56112@freescale.com>
---
- X11/xserver-common | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/X11/xserver-common b/X11/xserver-common
-index 4dc48c4..d19b858 100644
--- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -44,6 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg`
- export USER=root
- export XSERVER_DEFAULT_ORIENTATION=normal
- 
-+INPUT_EXTRA_ARGS="+iglx"
- ARGS="-br -pn -nolisten tcp $INPUT_EXTRA_ARGS"
- DPI="100"
- MOUSE=""
-- 
-1.9.1
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend
deleted file mode 100644
index be6945744..000000000
--- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-# i.MX extra configuration 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:imxgpu3d = " \
-    file://0016-xserver-common-enable-iglx-module.patch \
-"
-PACKAGE_ARCH:imxgpu3d = "${MACHINE_SOCARCH}"
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-Add-support-for-i.MX-codecs-to-phonon.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-Add-support-for-i.MX-codecs-to-phonon.patch
index 1213650c2..9508aee3b 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-Add-support-for-i.MX-codecs-to-phonon.patch
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-Add-support-for-i.MX-codecs-to-phonon.patch
@@ -5,6 +5,7 @@ Subject: [PATCH] Add support for i.MX codecs to phonon
 Add support for i.MX codecs to phonon
+Upstream-Status: Pending
 Signed-off-by: Daniele Dall'Acqua <daniele.d@freescale.com>
 Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
 ---
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch
index 7eee7cf2a..c954abfb8 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch
@@ -4,6 +4,7 @@ Date: Thu, 29 Sep 2022 16:06:04 +0200
 Subject: [PATCH 1/2] config.tests: add DEFINES to compile egl test with
 imxgpu2d (Vivante)
+Upstream-Status: Pending
 Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com>
 ---
 config.tests/unix/egl/egl.pro | 1 +
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch
index 993df85e9..b29be7d3c 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch
@@ -4,6 +4,7 @@ Date: Thu, 29 Sep 2022 16:12:11 +0200
 Subject: [PATCH 2/2] config.tests: add DEFINES to compile egl4gles1 test with
 imxgpu2d (Vivante)
+Upstream-Status: Pending
 Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com>
 ---
 config.tests/unix/egl4gles1/egl4gles1.pro | 1 +
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch
index 0226db598..fe4c4393b 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch
@@ -18,6 +18,7 @@ a particular session for use in multi-headed applications.
 The default is /dev/video17:
        export v4lsinkdev=/dev/video17
+Upstream-Status: Pending
 Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
 ---
 src/3rdparty/phonon/gstreamer/widgetrenderer.cpp | 5 ++++-
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch
index e86d9ed54..57e38be50 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 Index: git/mkspecs/linux-oe-g++/qmake.conf
 ===================================================================
 --- git.orig/mkspecs/linux-oe-g++/qmake.conf    2017-06-26 10:20:57.139653321 -0500
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 7401a5669..e450e568e 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -12,6 +12,7 @@ SRC_URI:append:imxgpu = " \
 PACKAGECONFIG_GL_IMX_GPU     = ""
 PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms"
+PACKAGECONFIG_GL_IMX_GPU:mx95-nxp-bsp = "gbm kms"
 PACKAGECONFIG_GL:imxpxp   = "gles2"
 PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
@@ -31,6 +32,7 @@ PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}"
 PACKAGECONFIG_VULKAN_IMX_GPU       = ""
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp   = "vulkan"
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
 PACKAGECONFIG_VULKAN               = ""
 PACKAGECONFIG_VULKAN:imxgpu        = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
index a97b765f1..659a7cc0a 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -6,3 +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"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
index 1c51fc09d..b12499666 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
@@ -14,6 +14,8 @@ PACKAGECONFIG_GRAPHICS:imxgpu3d = " \
 PACKAGECONFIG_GRAPHICS_IMX_GPU = ""
 PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \
    gbm kms"
+PACKAGECONFIG_GRAPHICS_IMX_GPU:mx95-nxp-bsp = " \
+    gbm kms"
 PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \
    gles2 gbm kms"
@@ -51,4 +53,5 @@ PACKAGECONFIG_VULKAN:imxgpu = " \
    ${PACKAGECONFIG_VULKAN_IMX_GPU}"
 PACKAGECONFIG_VULKAN_IMX_GPU               = ""
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx95-nxp-bsp   = "vulkan"
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
index ca011758b..f2b0b8025 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
@@ -4,3 +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"
diff --git a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
index f64637bd3..7cb6c07a3 100644
--- a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
+++ b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
@@ -4,6 +4,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI:append:qoriq-ppc = " file://qemu.conf"
 do_install:append:qoriq-ppc() {
-        install -m 0644 ${WORKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
+        install -m 0644 ${UNPACKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
 }
diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend
index b6194d76b..c31fb04be 100644
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -2,3 +2,4 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 PACKAGE_ARCH:imx-generic-bsp = "${MACHINE_ARCH}"
+PACKAGE_ARCH:qoriq-generic-bsp = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state
index ace734df4..bf97f7d2f 100755
--- a/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state
+++ b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state
@@ -1375,7 +1375,7 @@ state.wm8962audio {
        control.117 {
                iface MIXER
                name 'INPGAR IN2R Switch'
-                value false
+                value true
                comment {
                        access 'read write'
                        type BOOLEAN
@@ -1405,7 +1405,7 @@ state.wm8962audio {
        control.120 {
                iface MIXER
                name 'INPGAL IN1L Switch'
-                value true
+                value false
                comment {
                        access 'read write'
                        type BOOLEAN
@@ -1425,7 +1425,7 @@ state.wm8962audio {
        control.122 {
                iface MIXER
                name 'INPGAL IN3L Switch'
-                value false
+                value true
                comment {
                        access 'read write'
                        type BOOLEAN
@@ -9846,3 +9846,1458 @@ state.wm8960audio4 {
                }
        }
 }
+state.sofwm8962audio {
+        control.1 {
+                iface MIXER
+                name 'Input Mixer Switch'
+                value.0 true
+                value.1 true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.2 {
+                iface MIXER
+                name 'MIXINL IN2L Volume'
+                value 5
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 0
+                }
+        }
+        control.3 {
+                iface MIXER
+                name 'MIXINL PGA Volume'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin 0
+                        dbmax 3000
+                        dbvalue.0 0
+                }
+        }
+        control.4 {
+                iface MIXER
+                name 'MIXINL IN3L Volume'
+                value 5
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 0
+                }
+        }
+        control.5 {
+                iface MIXER
+                name 'MIXINR IN2R Volume'
+                value 5
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 0
+                }
+        }
+        control.6 {
+                iface MIXER
+                name 'MIXINR PGA Volume'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin 0
+                        dbmax 3000
+                        dbvalue.0 0
+                }
+        }
+        control.7 {
+                iface MIXER
+                name 'MIXINR IN3R Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.8 {
+                iface MIXER
+                name 'Digital Capture Volume'
+                value.0 108
+                value.1 108
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 127'
+                        dbmin -9999999
+                        dbmax 2325
+                        dbvalue.0 900
+                        dbvalue.1 900
+                }
+        }
+        control.9 {
+                iface MIXER
+                name 'Capture Volume'
+                value.0 40
+                value.1 40
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 63'
+                        dbmin -2325
+                        dbmax 2400
+                        dbvalue.0 675
+                        dbvalue.1 675
+                }
+        }
+        control.10 {
+                iface MIXER
+                name 'Capture Switch'
+                value.0 true
+                value.1 true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.11 {
+                iface MIXER
+                name 'Capture ZC Switch'
+                value.0 true
+                value.1 true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.12 {
+                iface MIXER
+                name 'Capture HPF Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.13 {
+                iface MIXER
+                name 'Capture HPF Mode'
+                value Hi-fi
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 Hi-fi
+                        item.1 Application
+                }
+        }
+        control.14 {
+                iface MIXER
+                name 'Capture HPF Cutoff'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                }
+        }
+        control.15 {
+                iface MIXER
+                name 'Capture LHPF Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.16 {
+                iface MIXER
+                name 'Capture LHPF Mode'
+                value LPF
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 LPF
+                        item.1 HPF
+                }
+        }
+        control.17 {
+                iface MIXER
+                name 'Sidetone Volume'
+                value.0 0
+                value.1 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 12'
+                        dbmin -3600
+                        dbmax 0
+                        dbvalue.0 -3600
+                        dbvalue.1 -3600
+                }
+        }
+        control.18 {
+                iface MIXER
+                name 'Digital Playback Volume'
+                value.0 96
+                value.1 96
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 127'
+                        dbmin -9999999
+                        dbmax 2325
+                        dbvalue.0 0
+                        dbvalue.1 0
+                }
+        }
+        control.19 {
+                iface MIXER
+                name 'DAC High Performance Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.20 {
+                iface MIXER
+                name 'DAC L/R Swap Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.21 {
+                iface MIXER
+                name 'ADC L/R Swap Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.22 {
+                iface MIXER
+                name 'ADC High Performance Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.23 {
+                iface MIXER
+                name 'Beep Volume'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 15'
+                        dbmin -9999999
+                        dbmax -600
+                        dbvalue.0 -9999999
+                }
+        }
+        control.24 {
+                iface MIXER
+                name 'Headphone Volume'
+                value.0 93
+                value.1 93
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 127'
+                        dbmin -9999999
+                        dbmax 600
+                        dbvalue.0 -2800
+                        dbvalue.1 -2800
+                }
+        }
+        control.25 {
+                iface MIXER
+                name 'Headphone Switch'
+                value.0 true
+                value.1 true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.26 {
+                iface MIXER
+                name 'Headphone ZC Switch'
+                value.0 false
+                value.1 false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.27 {
+                iface MIXER
+                name 'Headphone Aux Volume'
+                value.0 7
+                value.1 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 7'
+                        dbmin -700
+                        dbmax 0
+                        dbvalue.0 0
+                        dbvalue.1 0
+                }
+        }
+        control.28 {
+                iface MIXER
+                name 'Headphone Mixer Switch'
+                value.0 false
+                value.1 false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.29 {
+                iface MIXER
+                name 'HPMIXL IN4L Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.30 {
+                iface MIXER
+                name 'HPMIXL IN4R Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.31 {
+                iface MIXER
+                name 'HPMIXL MIXINL Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.32 {
+                iface MIXER
+                name 'HPMIXL MIXINR Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.33 {
+                iface MIXER
+                name 'HPMIXR IN4L Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.34 {
+                iface MIXER
+                name 'HPMIXR IN4R Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.35 {
+                iface MIXER
+                name 'HPMIXR MIXINL Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.36 {
+                iface MIXER
+                name 'HPMIXR MIXINR Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.37 {
+                iface MIXER
+                name 'Speaker Boost Volume'
+                value 3
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin 0
+                        dbmax 1200
+                        dbvalue.0 450
+                }
+        }
+        control.38 {
+                iface MIXER
+                name 'EQ Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.39 {
+                iface MIXER
+                name 'EQ1 Volume'
+                value.0 12
+                value.1 12
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 31'
+                        dbmin -1200
+                        dbmax 1900
+                        dbvalue.0 0
+                        dbvalue.1 0
+                }
+        }
+        control.40 {
+                iface MIXER
+                name 'EQ2 Volume'
+                value.0 12
+                value.1 12
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 31'
+                        dbmin -1200
+                        dbmax 1900
+                        dbvalue.0 0
+                        dbvalue.1 0
+                }
+        }
+        control.41 {
+                iface MIXER
+                name 'EQ3 Volume'
+                value.0 12
+                value.1 12
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 31'
+                        dbmin -1200
+                        dbmax 1900
+                        dbvalue.0 0
+                        dbvalue.1 0
+                }
+        }
+        control.42 {
+                iface MIXER
+                name 'EQ4 Volume'
+                value.0 12
+                value.1 12
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 31'
+                        dbmin -1200
+                        dbmax 1900
+                        dbvalue.0 0
+                        dbvalue.1 0
+                }
+        }
+        control.43 {
+                iface MIXER
+                name 'EQ5 Volume'
+                value.0 12
+                value.1 12
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 31'
+                        dbmin -1200
+                        dbmax 1900
+                        dbvalue.0 0
+                        dbvalue.1 0
+                }
+        }
+        control.44 {
+                iface MIXER
+                name 'EQL Coefficients'
+                value '0fca040000d81eb5f1450b7501c51c58f3730a540558168ef82907ad1103056405594000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 36
+                }
+        }
+        control.45 {
+                iface MIXER
+                name 'EQR Coefficients'
+                value '0fca040000d81eb5f1450b7501c51c58f3730a540558168ef82907ad1103056405594000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 36
+                }
+        }
+        control.46 {
+                iface MIXER
+                name '3D Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.47 {
+                iface MIXER
+                name '3D Coefficients'
+                value '0040000000000000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 8
+                }
+        }
+        control.48 {
+                iface MIXER
+                name 'DF1 Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.49 {
+                iface MIXER
+                name 'DF1 Coefficients'
+                value '0000000000000000000000000000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 14
+                }
+        }
+        control.50 {
+                iface MIXER
+                name 'DRC Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.51 {
+                iface MIXER
+                name 'DRC Coefficients'
+                value '000c0925000000000000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 10
+                }
+        }
+        control.52 {
+                iface MIXER
+                name 'VSS Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.53 {
+                iface MIXER
+                name 'VSS Coefficients'
+                value '008c020000350700003a4100008b7d00003a4100008cfee800780000003fb260002d18180020000000f1834000fb830000eeaec000fbac4000f17f8000f43b4000f5fb0000ea10c000fcc58000e275c00004b48000d4f9800004914000d8a48000023dc000cf7a8000dc060000f2dac000baf340000a7940001c068000fd2d00001ce840000ddc4000fc9d000009558000fe7e80000eab4000f99880000987c000fd2c400009480000035f400000870000fae4c000000b400004e18000011f4000f8b00000fbcbc00004f3800007df4000ff070000efd70000fbaf4000108a80001107c000e0080000d276000020cf400030234000fd69c0002835000006330000d9f6c000f33340000f420000040c8000fb3f8000f757c0000354000000c6c0000312c000fd8580'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 296
+                }
+        }
+        control.54 {
+                iface MIXER
+                name 'HPF1 Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.55 {
+                iface MIXER
+                name 'HPF2 Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.56 {
+                iface MIXER
+                name 'HPF Coefficients'
+                value '0000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 2
+                }
+        }
+        control.57 {
+                iface MIXER
+                name 'HD Bass Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.58 {
+                iface MIXER
+                name 'HD Bass Coefficients'
+                value '0002bd12007c586c00538121003f8bd80032f52d0065ac8c006be08700721483007214830043352500066a4a0043607900080000000100000059999a'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 60
+                }
+        }
+        control.59 {
+                iface MIXER
+                name 'ALC Switch'
+                value.0 false
+                value.1 false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.60 {
+                iface MIXER
+                name ALC1
+                value '007b'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 2
+                }
+        }
+        control.61 {
+                iface MIXER
+                name ALC2
+                value '0000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 2
+                }
+        }
+        control.62 {
+                iface MIXER
+                name ALC3
+                value '1c32'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 2
+                }
+        }
+        control.63 {
+                iface MIXER
+                name 'Noise Gate'
+                value '3200'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 2
+                }
+        }
+        control.64 {
+                iface MIXER
+                name 'Speaker Volume'
+                value.0 114
+                value.1 114
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 2
+                        range '0 - 127'
+                        dbmin -9999999
+                        dbmax 600
+                        dbvalue.0 -700
+                        dbvalue.1 -700
+                }
+        }
+        control.65 {
+                iface MIXER
+                name 'Speaker Switch'
+                value.0 true
+                value.1 true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.66 {
+                iface MIXER
+                name 'Speaker ZC Switch'
+                value.0 false
+                value.1 false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.67 {
+                iface MIXER
+                name 'Speaker Mixer Switch'
+                value.0 false
+                value.1 false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 2
+                }
+        }
+        control.68 {
+                iface MIXER
+                name 'SPKOUTL Mixer IN4L Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.69 {
+                iface MIXER
+                name 'SPKOUTL Mixer IN4R Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.70 {
+                iface MIXER
+                name 'SPKOUTL Mixer MIXINL Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.71 {
+                iface MIXER
+                name 'SPKOUTL Mixer MIXINR Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.72 {
+                iface MIXER
+                name 'SPKOUTL Mixer DACL Volume'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 -600
+                }
+        }
+        control.73 {
+                iface MIXER
+                name 'SPKOUTL Mixer DACR Volume'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 -600
+                }
+        }
+        control.74 {
+                iface MIXER
+                name 'SPKOUTR Mixer IN4L Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.75 {
+                iface MIXER
+                name 'SPKOUTR Mixer IN4R Volume'
+                value 7
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 7'
+                        dbmin -1500
+                        dbmax 600
+                        dbvalue.0 600
+                }
+        }
+        control.76 {
+                iface MIXER
+                name 'SPKOUTR Mixer MIXINL Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.77 {
+                iface MIXER
+                name 'SPKOUTR Mixer MIXINR Volume'
+                value 1
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 0
+                }
+        }
+        control.78 {
+                iface MIXER
+                name 'SPKOUTR Mixer DACL Volume'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 -600
+                }
+        }
+        control.79 {
+                iface MIXER
+                name 'SPKOUTR Mixer DACR Volume'
+                value 0
+                comment {
+                        access 'read write'
+                        type INTEGER
+                        count 1
+                        range '0 - 1'
+                        dbmin -600
+                        dbmax 0
+                        dbvalue.0 -600
+                }
+        }
+        control.80 {
+                iface MIXER
+                name 'SPKOUTR PGA'
+                value DAC
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 DAC
+                        item.1 Mixer
+                }
+        }
+        control.81 {
+                iface MIXER
+                name 'SPKOUTL PGA'
+                value DAC
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 DAC
+                        item.1 Mixer
+                }
+        }
+        control.82 {
+                iface MIXER
+                name 'SPKOUTR Mixer DACL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.83 {
+                iface MIXER
+                name 'SPKOUTR Mixer DACR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.84 {
+                iface MIXER
+                name 'SPKOUTR Mixer MIXINL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.85 {
+                iface MIXER
+                name 'SPKOUTR Mixer MIXINR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.86 {
+                iface MIXER
+                name 'SPKOUTR Mixer IN4L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.87 {
+                iface MIXER
+                name 'SPKOUTR Mixer IN4R Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.88 {
+                iface MIXER
+                name 'SPKOUTL Mixer DACL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.89 {
+                iface MIXER
+                name 'SPKOUTL Mixer DACR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.90 {
+                iface MIXER
+                name 'SPKOUTL Mixer MIXINL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.91 {
+                iface MIXER
+                name 'SPKOUTL Mixer MIXINR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.92 {
+                iface MIXER
+                name 'SPKOUTL Mixer IN4L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.93 {
+                iface MIXER
+                name 'SPKOUTL Mixer IN4R Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.94 {
+                iface MIXER
+                name 'HPOUTR PGA'
+                value DAC
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 DAC
+                        item.1 Mixer
+                }
+        }
+        control.95 {
+                iface MIXER
+                name 'HPOUTL PGA'
+                value DAC
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 DAC
+                        item.1 Mixer
+                }
+        }
+        control.96 {
+                iface MIXER
+                name 'HPMIXR DACL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.97 {
+                iface MIXER
+                name 'HPMIXR DACR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.98 {
+                iface MIXER
+                name 'HPMIXR MIXINL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.99 {
+                iface MIXER
+                name 'HPMIXR MIXINR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.100 {
+                iface MIXER
+                name 'HPMIXR IN4L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.101 {
+                iface MIXER
+                name 'HPMIXR IN4R Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.102 {
+                iface MIXER
+                name 'HPMIXL DACL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.103 {
+                iface MIXER
+                name 'HPMIXL DACR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.104 {
+                iface MIXER
+                name 'HPMIXL MIXINL Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.105 {
+                iface MIXER
+                name 'HPMIXL MIXINR Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.106 {
+                iface MIXER
+                name 'HPMIXL IN4L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.107 {
+                iface MIXER
+                name 'HPMIXL IN4R Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.108 {
+                iface MIXER
+                name STR
+                value None
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 None
+                        item.1 Left
+                        item.2 Right
+                }
+        }
+        control.109 {
+                iface MIXER
+                name STL
+                value None
+                comment {
+                        access 'read write'
+                        type ENUMERATED
+                        count 1
+                        item.0 None
+                        item.1 Left
+                        item.2 Right
+                }
+        }
+        control.110 {
+                iface MIXER
+                name 'MIXINR IN2R Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.111 {
+                iface MIXER
+                name 'MIXINR IN3R Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.112 {
+                iface MIXER
+                name 'MIXINR PGA Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.113 {
+                iface MIXER
+                name 'MIXINL IN2L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.114 {
+                iface MIXER
+                name 'MIXINL IN3L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.115 {
+                iface MIXER
+                name 'MIXINL PGA Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.116 {
+                iface MIXER
+                name 'INPGAR IN1R Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.117 {
+                iface MIXER
+                name 'INPGAR IN2R Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.118 {
+                iface MIXER
+                name 'INPGAR IN3R Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.119 {
+                iface MIXER
+                name 'INPGAR IN4R Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.120 {
+                iface MIXER
+                name 'INPGAL IN1L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.121 {
+                iface MIXER
+                name 'INPGAL IN2L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.122 {
+                iface MIXER
+                name 'INPGAL IN3L Switch'
+                value true
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.123 {
+                iface MIXER
+                name 'INPGAL IN4L Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.124 {
+                iface CARD
+                name 'Headphone Jack'
+                value true
+                comment {
+                        access read
+                        type BOOLEAN
+                        count 1
+                }
+        }
+}
diff --git a/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf
index c511018e9..5ed3bdd92 100644
--- a/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf
+++ b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf
@@ -218,8 +218,8 @@ rate 8000
 pcm.asymed{
 type asym
-playback.pcm "dmix_44100"
+playback.pcm "dmix_48000"
-capture.pcm "dsnoop_44100"
+capture.pcm "dsnoop_48000"
 }
 pcm.dsp0{
diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
index 0084f4a0b..f5918669b 100644
--- a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
+++ b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
@@ -218,8 +218,8 @@ rate 8000
 pcm.asymed{
 type asym
-playback.pcm "dmix_44100"
+playback.pcm "dmix_48000"
-capture.pcm "dsnoop_44100"
+capture.pcm "dsnoop_48000"
 }
 pcm.dsp0{
diff --git a/recipes-bsp/alsa-state/alsa-state/qoriq-generic-bsp b/recipes-bsp/alsa-state/alsa-state/qoriq-generic-bsp
new file mode 120000
index 000000000..febb30e2c
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/qoriq-generic-bsp
@@ -0,0 +1 @@
+imx-generic-bsp
+\ No newline at end of file
diff --git a/recipes-bsp/alsa-state/alsa-state/qoriq-mainline-bsp b/recipes-bsp/alsa-state/alsa-state/qoriq-mainline-bsp
new file mode 120000
index 000000000..b43cbb34c
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/qoriq-mainline-bsp
@@ -0,0 +1 @@
+imx-mainline-bsp
+\ No newline at end of file
diff --git a/recipes-bsp/alsa-state/alsa-state/qoriq-nxp-bsp b/recipes-bsp/alsa-state/alsa-state/qoriq-nxp-bsp
new file mode 120000
index 000000000..022b2509e
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/qoriq-nxp-bsp
@@ -0,0 +1 @@
+imx-nxp-bsp
+\ No newline at end of file
diff --git a/recipes-bsp/atf/qoriq-atf-2.6.inc b/recipes-bsp/atf/qoriq-atf-2.6.inc
index d5ef5e75e..7a752ee93 100644
--- a/recipes-bsp/atf/qoriq-atf-2.6.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.6.inc
@@ -7,6 +7,3 @@ ATF_BRANCH ?= "lf_v2.6"
 ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https"
 SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}"
 SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75"
-S = "${WORKDIR}/git"
diff --git a/recipes-bsp/atf/qoriq-atf_2.6.bb b/recipes-bsp/atf/qoriq-atf_2.6.bb
index 5ae2ed9d1..9f2b0e47a 100644
--- a/recipes-bsp/atf/qoriq-atf_2.6.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.6.bb
@@ -51,8 +51,8 @@ FIP_DDR:lx2160a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'fip_ddr',
 FIP_DDR:lx2162a = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'fip_ddr', '', d)}"
 # requires CROSS_COMPILE set by hand as there is no configure script
-export CROSS_COMPILE="${TARGET_PREFIX}"
+export CROSS_COMPILE = "${TARGET_PREFIX}"
-export ARCH="arm64"
+export ARCH = "arm64"
 # Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is
 # a standalone application
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 5cf543ab7..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
@@ -6,10 +6,9 @@ inherit deploy fsl-eula-unpack
 SRC_URI = "${FSL_MIRROR}/firmware-imx-8.16.bin;fsl-eula=true"
-SRC_URI[md5sum] = "9ed2923c0eb511c7fcf37dd607944124"
 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_0.1.1.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb
deleted file mode 100644
index 70252c01c..000000000
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2023 NXP
-SUMMARY = "NXP i.MX ELE firmware"
-DESCRIPTION = "EdgeLock Enclave firmware for i.MX series SoCs"
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "f4df2005ec4555e9f177acbf62a7a969"
-SRC_URI[sha256sum] = "3f69d6cf6ea448c5c2f87b6acdad1c5c2318616d246cc5047a523f2543fee408"
-do_compile[noexec] = "1"
-do_install() {
-   install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
-   install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
-       install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   fi
-}
-do_deploy () {
-    # Deploy the related firmware to be package by imx-boot
-    install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
-}
-addtask deploy after do_install before do_build
-PACKAGES += "${PN}-ext"
-ALLOW_EMPTY:${PN}-ext = "1"
-FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
-FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
-RREPLACES:${PN} = "firmware-sentinel"
-RPROVIDES:${PN} = "firmware-sentinel"
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb
new file mode 100644
index 000000000..b785613a1
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb
@@ -0,0 +1,42 @@
+# Copyright 2021-2025 NXP
+SUMMARY = "NXP i.MX ELE firmware"
+DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+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"
+SRC_URI[sha256sum] = "14ad172ed70d2f16decca4b55e508dad32923390a298f10a598e8bc7778b6b66"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+do_compile[noexec] = "1"
+do_install() {
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
+    install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
+        install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    fi
+}
+do_deploy () {
+    # Deploy the related firmware to be package by imx-boot
+    install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
+}
+addtask deploy after do_install before do_build
+PACKAGES += "${PN}-ext"
+ALLOW_EMPTY:${PN}-ext = "1"
+FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
+FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
+RREPLACES:${PN} = "firmware-sentinel"
+RPROVIDES:${PN} = "firmware-sentinel"
+COMPATIBLE_MACHINE = "(mx8ulp-generic-bsp|mx9-generic-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.23.inc b/recipes-bsp/firmware-imx/firmware-imx-8.23.inc
deleted file mode 100644
index bd471f777..000000000
--- a/recipes-bsp/firmware-imx/firmware-imx-8.23.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2022 NXP
-# Copyright (C) 2018 O.S. Systems Software LTDA.
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-SRC_URI = " \
-    ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
-"
-SRC_URI[md5sum] = "eb03efb3a8fb98d99ed1df88537e72f4"
-SRC_URI[sha256sum] = "fe07633295dac3dd99f0ba4e07a7cde95bb24a29ca82b9a9b3f6026d29ae916a"
-S = "${WORKDIR}/firmware-imx-${PV}"
-inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
new file mode 100644
index 000000000..20a66a1e3
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
@@ -0,0 +1,16 @@
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Copyright 2017-2024 NXP
+# Copyright (C) 2018 O.S. Systems Software LTDA.
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+# 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"
+SRC_URI[sha256sum] = "61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f"
+S = "${UNPACKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb b/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
index 0c935b92e..7bac8106d 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
@@ -1,10 +1,10 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2021,2023 NXP
+# Copyright 2017-2021,2024 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SUMMARY = "Freescale i.MX firmware"
 DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
-require firmware-imx-${PV}.inc
+require ${BP}.inc
 PE = "1"
@@ -102,14 +102,14 @@ python populate_packages:prepend() {
    easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d)
-    do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin',
+    do_split_packages(d, easrcdir, r'^easrc-([^_]*).*\.bin',
                      output_pattern='firmware-imx-easrc-%s',
                      description='Freescale IMX EASRC Firmware [%s]',
                      extra_depends='',
                      prepend=True)
    vpudir = bb.data.expand('${nonarch_base_libdir}/firmware/vpu', d)
-    do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
+    do_split_packages(d, vpudir, r'^vpu_fw_([^_]*).*\.bin',
                      output_pattern='firmware-imx-vpu-%s',
                      description='Freescale IMX VPU Firmware [%s]',
                      hook=coda_vpu_links,
@@ -117,21 +117,21 @@ python populate_packages:prepend() {
                      prepend=True)
    sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/sdma', d)
-    do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
+    do_split_packages(d, sdmadir, r'^sdma-([^-]*).*\.bin',
                      output_pattern='firmware-imx-sdma-%s',
                      description='Freescale IMX SDMA Firmware [%s]',
                      extra_depends='',
                      prepend=True)
    xcvrdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xcvr', d)
-    do_split_packages(d, xcvrdir, '^xcvr-([^_]*).*\.bin',
+    do_split_packages(d, xcvrdir, r'^xcvr-([^_]*).*\.bin',
                      output_pattern='firmware-imx-xcvr-%s',
                      description='Freescale IMX XCVR Firmware [%s]',
                      extra_depends='',
                      prepend=True)
    xuvidir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xuvi', d)
-    do_split_packages(d, xuvidir, '^vpu_fw_([^_]*).*\.bin',
+    do_split_packages(d, xuvidir, r'^vpu_fw_([^_]*).*\.bin',
                      output_pattern='firmware-imx-xuvi-%s',
                      description='Freescale IMX XUVI Firmware [%s]',
                      extra_depends='',
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index d28b23821..59ce30d03 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 NXP
+# Copyright 2020-2024 NXP
 SUMMARY = "Wi-Fi firmware redistributed by NXP"
 DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
@@ -7,18 +7,18 @@ should be preferred."
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3"
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.12.3_1.0.0"
-SRCREV = "2afa15e77f0b58eade42b4f59c9215339efcca66"
+SRCREV = "eef7ef94bc44cacd3b068f66658ef33391547daa"
-S = "${WORKDIR}/git"
 inherit allarch
 CLEANBROKEN = "1"
 ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-all-sdio = "1"
+ALLOW_EMPTY:${PN}-all-pcie = "1"
 do_compile() {
        :
@@ -44,7 +44,16 @@ do_install() {
    oe_runmake install INSTALLDIR=${D}${nonarch_base_libdir}/firmware/nxp
+    # Upstream SDIO8997 and IW416 driver firmwares are located on mrvl folder
+    install -d ${D}${nonarch_base_libdir}/firmware/mrvl
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd9098_wlan_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio9098_wlan_v1.bin
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart9098_combo_v1.bin
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd8997_wlan_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio8997_wlan_v4.bin
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduartiw416_combo.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin
 }
 PACKAGES =+ " \
@@ -59,6 +68,7 @@ PACKAGES =+ " \
    ${PN}-nxp9098-common \
    ${PN}-nxp9098-sdio \
    ${PN}-nxpiw416-sdio \
+    ${PN}-nxpiw610-sdio \
    ${PN}-nxpiw612-sdio \
 "
@@ -88,7 +98,7 @@ RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 FILES:${PN}-nxp8997-common = " \
    ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \
    ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \
-    ${nonarch_base_libdir}/firmware/nxp/uartuart8997_bt_v4.bin \
+    ${nonarch_base_libdir}/firmware/nxp/uart8997_bt_v4.bin \
 "
 RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
@@ -104,7 +114,8 @@ RREPLACES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
 RCONFLICTS:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
 FILES:${PN}-nxp8997-sdio = " \
-    ${nonarch_base_libdir}/firmware/nxp/sdio*8997* \
+    ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
+    ${nonarch_base_libdir}/firmware/nxp/sd*8997* \
 "
 RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common"
 RPROVIDES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
@@ -114,7 +125,7 @@ RCONFLICTS:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
 FILES:${PN}-nxp9098-common = " \
    ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
    ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \
-    ${nonarch_base_libdir}/firmware/nxp/uartuart9098_bt_v1.bin \
+    ${nonarch_base_libdir}/firmware/nxp/uart9098_bt_v1.bin \
 "
 RDEPENDS:${PN}-nxp9098-common += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
@@ -130,7 +141,7 @@ RREPLACES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 FILES:${PN}-nxp9098-sdio = " \
-    ${nonarch_base_libdir}/firmware/nxp/sdio*9098* \
+    ${nonarch_base_libdir}/firmware/nxp/sd*9098* \
 "
 RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common"
 RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
@@ -138,6 +149,7 @@ RREPLACES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RCONFLICTS:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 FILES:${PN}-nxpiw416-sdio = " \
+    ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \
    ${nonarch_base_libdir}/firmware/nxp/*iw416* \
 "
 RDEPENDS:${PN}-nxpiw416-sdio += "${PN}-nxp-common"
@@ -145,15 +157,39 @@ RPROVIDES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 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/uart_iw610_bt.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartspi_iw610.bin.se \
+"
+RDEPENDS:${PN}-nxpiw610-sdio += "${PN}-nxp-common"
+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}-nxpiw612-sdio = " \
    ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \
+    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_v1.bin.se \
 "
 RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
-COMPATIBLE_MACHINE = "(imx-generic-bsp)"
+RDEPENDS:${PN}-all-sdio = " \
+    ${PN}-nxp8801-sdio \
+    ${PN}-nxp8987-sdio \
+    ${PN}-nxp9098-sdio \
+    ${PN}-nxpiw416-sdio \
+    ${PN}-nxpiw610-sdio \
+    ${PN}-nxpiw612-sdio \
+"
+RDEPENDS:${PN}-all-pcie = " \
+    ${PN}-nxp8997-pcie \
+    ${PN}-nxp9098-pcie \
+"
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 9778bd1cf..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
@@ -8,10 +8,9 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444"
 SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz"
-SRC_URI[md5sum] = "f7d277717b3f0dd17e8d341c1091d6b6"
 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.23.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
index 246198596..c35e31e07 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.23.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 NXP
+# Copyright (C) 2018-2024 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 3a7660f86..2b5a9f50d 100644
--- a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
+++ b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
@@ -4,13 +4,12 @@ LICENSE = "Proprietary"
 SECTION = "BSP"
 LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${UNPACKDIR}/${PN}-${PV}"
 inherit fsl-eula-unpack pkgconfig deploy
-SRC_URI[md5sum] = "65f28bd8ace3ce7116cb15685bfe1cd0"
 SRC_URI[sha256sum] = "1df3a03d69feb38a450ee63abc7713d78cf6339988476e4c9f95ebbf63790f66"
 do_configure[noexec] = "1"
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/0001-imx93-trdc-Fix-header-guard.patch b/recipes-bsp/imx-atf/imx-atf/0001-imx93-trdc-Fix-header-guard.patch
new file mode 100644
index 000000000..f475cf334
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf/0001-imx93-trdc-Fix-header-guard.patch
@@ -0,0 +1,35 @@
+From e82cafa7823cb2cad6ce933862b9ffdb880dba49 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Tue, 10 Jun 2025 15:04:32 -0700
+Subject: [PATCH] imx93: trdc: Fix header guard
+```
+| In file included from drivers/nxp/trdc/imx_trdc.c:13:
+| include/drivers/nxp/trdc/imx_trdc.h:7: error: header guard 'IMX_TRDC_H' followed by '#define' of a different macro [-Werror=header-guard]
+|     7 | #ifndef IMX_TRDC_H
+| include/drivers/nxp/trdc/imx_trdc.h:8: note: 'IMX_XRDC_H' is defined here; did you mean 'IMX_TRDC_H'?
+|     8 | #define IMX_XRDC_H
+```
+Upstream-Status: Submitted [https://github.com/nxp-imx/imx-atf/pull/2]
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+---
+ include/drivers/nxp/trdc/imx_trdc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/include/drivers/nxp/trdc/imx_trdc.h b/include/drivers/nxp/trdc/imx_trdc.h
+index 7a6200c8d..8c759c65d 100644
+--- a/include/drivers/nxp/trdc/imx_trdc.h
+++ b/include/drivers/nxp/trdc/imx_trdc.h
+@@ -5,7 +5,7 @@
+  */
+ 
+ #ifndef IMX_TRDC_H
+-#define IMX_XRDC_H
+#define IMX_TRDC_H
+ 
+ #define MBC_BLK_ALL    U(255)
+ #define MRC_REG_ALL    U(16)
+-- 
+2.34.1
diff --git a/recipes-bsp/imx-atf/imx-atf_2.8.bb b/recipes-bsp/imx-atf/imx-atf_2.10.bb
index 8bd6ad121..7448c28c5 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.8.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.10.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2023 NXP
+# Copyright (C) 2017-2024 NXP
 DESCRIPTION = "i.MX ARM Trusted Firmware"
 SECTION = "BSP"
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
 PV .= "+git${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
-SRCBRANCH = "lf_v2.8"
+           file://0001-imx93-trdc-Fix-header-guard.patch"
-SRCREV = "8dbe28631802a51b3ec8179b2c5635b00393ad97"
+SRCBRANCH = "lf_v2.10"
+SRCREV = "78a14c75a06dea39036c44ae0f9d23acc7bcaef2"
-S = "${WORKDIR}/git"
 inherit deploy
@@ -34,7 +33,7 @@ LD[unexport] = "1"
 # Baremetal, just need a compiler
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "virtual/${HOST_PREFIX}gcc"
+DEPENDS = "virtual/cross-cc"
 # Bring in clang compiler if using clang as default
 DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}"
@@ -48,7 +47,9 @@ def remove_options_tail (in_string):
    from itertools import takewhile
    return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' ')))
-EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}.bfd"'
+# LD can have linker suffix in its name e.g. aarch64-yoe-linux-ld.lld so we need to
+# drop .lld as well along with options from LD
+EXTRA_OEMAKE += 'LD="${HOST_PREFIX}ld.bfd"'
 EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"'
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/0001-Fix-gcc-15-errors.patch b/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch
new file mode 100644
index 000000000..964658fce
--- /dev/null
+++ b/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch
@@ -0,0 +1,54 @@
+From 24e317b5cdc2b78735dfa7d4b2776b587b7a193f Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Thu, 12 Jun 2025 13:15:28 -0500
+Subject: [PATCH] Fix gcc 15 errors
+Fixes HDMI and IPU headers c23 violations:
+```
+In file included from mxc_hdmi-cec.c:40:
+hdmi-cec.h:54:23: error: 'bool' cannot be defined via 'typedef'
+   54 | typedef unsigned char bool;
+      |                       ^~~~
+hdmi-cec.h:54:23: note: 'bool' is a keyword with '-std=c23' onwards
+hdmi-cec.h:54:1: warning: useless type name in empty declaration
+   54 | typedef unsigned char bool;
+      | ^~~~~~~
+```
+Upstream-Status: Submitted
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+---
+ hdmi-cec/hdmi-cec.h | 2 --
+ ipu/ipu.h           | 3 ---
+ 2 files changed, 5 deletions(-)
+diff --git a/hdmi-cec/hdmi-cec.h b/hdmi-cec/hdmi-cec.h
+index 7d466c5..2b66208 100644
+--- a/hdmi-cec/hdmi-cec.h
+++ b/hdmi-cec/hdmi-cec.h
+@@ -51,8 +51,6 @@
+ #define false  0
+ #endif
+ 
+-typedef unsigned char bool;
+-
+ /*!
+  * Enumeration of device type.
+  */
+diff --git a/ipu/ipu.h b/ipu/ipu.h
+index 278385c..1a55875 100644
+--- a/ipu/ipu.h
+++ b/ipu/ipu.h
+@@ -30,9 +30,6 @@
+ #ifdef __KERNEL__
+ #include <linux/interrupt.h>
+ #else
+-#ifndef __cplusplus
+-typedef unsigned char bool;
+-#endif
+ #define irqreturn_t int
+ #define dma_addr_t int
+ #define u32 unsigned int
+-- 
+2.34.1
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index d06ccfa10..a5df492d2 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -12,12 +12,11 @@ PE = "1"
 PV = "5.9+${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH} \
-SRCBRANCH = "lf-6.6.3_1.0.0"
+           file://0001-Fix-gcc-15-errors.patch"
+SRCBRANCH = "lf-6.12.3_1.0.0"
 SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
-S = "${WORKDIR}/git"
 inherit use-imx-headers
 PLATFORM:mx6q-nxp-bsp   = "IMX6Q"
@@ -32,7 +31,7 @@ PLATFORM:mx7ulp-nxp-bsp = "IMX7"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
 PLATFORM:mx9-nxp-bsp    = "IMX8ULP"
-PARALLEL_MAKE="-j 1"
+PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE = ""
 do_compile () {
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 7792b27bd..6b027eb75 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2024 NXP
 require imx-mkimage_git.inc
@@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "BSP"
-inherit use-imx-security-controller-firmware uboot-sign
+inherit use-imx-security-controller-firmware uboot-config
 DEPENDS += " \
    u-boot \
@@ -18,14 +18,11 @@ DEPENDS += " \
 # xxd is a dependency of fspi_packer.sh
 DEPENDS += "xxd-native"
 DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native"
-BOOT_NAME = "imx-boot"
+DEPENDS:append:mx93-generic-bsp = " u-boot-mkimage-native dtc-native"
-PROVIDES = "${BOOT_NAME}"
 inherit deploy uuu_bootloader_tag
-UUU_BOOTLOADER        = "${BOOT_NAME}"
+UUU_BOOTLOADER = "imx-boot"
-UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged"
-UUU_BOOTLOADER_UNTAGGED = "${BOOT_NAME}-untagged"
 # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build
 CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}"
@@ -41,14 +38,20 @@ do_compile[depends] += " \
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
+OEI_ENABLE = "${@bb.utils.contains('DEPENDS', 'virtual/imx-oei', 'YES', 'NO', d)}"
+OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
 ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
+BOOT_VARIANT ?= ""
 TOOLS_NAME ?= "mkimage_imx8"
 IMX_BOOT_SOC_TARGET       ?= "INVALID"
 DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
+DEPLOY_OPTEE_STMM = "${@bb.utils.contains('MACHINE_FEATURES', 'optee stmm', 'true', 'false', d)}"
 IMXBOOT_TARGETS ?= \
    "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \
@@ -58,24 +61,32 @@ IMXBOOT_TARGETS ?= \
 BOOT_STAGING       = "${S}/${IMX_BOOT_SOC_TARGET}"
 BOOT_STAGING:mx8m-generic-bsp  = "${S}/iMX8M"
 BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX"
-BOOT_STAGING:mx91p-generic-bsp   = "${S}/iMX91"
+BOOT_STAGING:mx91-generic-bsp  = "${S}/iMX91"
-BOOT_STAGING:mx93-generic-bsp   = "${S}/iMX93"
+BOOT_STAGING:mx93-generic-bsp  = "${S}/iMX93"
+BOOT_STAGING:mx95-generic-bsp  = "${S}/iMX95"
 SOC_FAMILY                    = "INVALID"
 SOC_FAMILY:mx8-generic-bsp    = "mx8"
 SOC_FAMILY:mx8m-generic-bsp   = "mx8m"
 SOC_FAMILY:mx8x-generic-bsp   = "mx8x"
 SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
-SOC_FAMILY:mx91p-generic-bsp  = "mx93"
+SOC_FAMILY:mx91-generic-bsp   = "mx91"
 SOC_FAMILY:mx93-generic-bsp   = "mx93"
+SOC_FAMILY:mx95-generic-bsp   = "mx95"
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
-do_uboot_assemble_fitimage:prepend:imx-generic-bsp() {
+MKIMAGE_EXTRA_ARGS ?= ""
-    for config in ${UBOOT_MACHINE}; do
+MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
-        mkdir -p ${B}/${config}
+    OEI=${OEI_ENABLE} \
-    done
+    LPDDR_TYPE=${DDR_TYPE} \
-}
+    ${@'LPDDR_FW_VERSION='+d.getVar('LPDDR_FW_VERSION') if d.getVar('LPDDR_FW_VERSION') else ''} \
+    ${@bb.utils.contains('SYSTEM_MANAGER_CONFIG', 'mx95alt', 'MSEL=1', '', d)}"
+MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \
+    ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
+    QSPI_HEADER=./scripts/fspi_header_133"
+UBOOT_DTB_BINARY ?= "u-boot.dtb"
 compile_mx8m() {
    bbnote 8MQ/8MM/8MN/8MP boot binary build
@@ -91,9 +102,13 @@ compile_mx8m() {
    if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
        # Use DTB binary patched with signature node
-        cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA}
+        cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}           ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA}
    else
-        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA}   ${BOOT_STAGING}
+        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \
+                                                             ${BOOT_STAGING}
+    fi
+    if [ "${UBOOT_DTB_NAME_EXTRA}" != "${UBOOT_DTB_NAME}" ] ; then
+        ln -sf ${UBOOT_DTB_NAME_EXTRA}                       ${BOOT_STAGING}/${UBOOT_DTB_NAME}
    fi
    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
@@ -101,9 +116,10 @@ compile_mx8m() {
    cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME}               ${BOOT_STAGING}/bl31.bin
-    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA}                     ${BOOT_STAGING}/u-boot.bin
+    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA}               ${BOOT_STAGING}/u-boot.bin
 }
 compile_mx8() {
    bbnote 8QM boot binary build
    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${BOOT_STAGING}/scfw_tcm.bin
@@ -140,6 +156,11 @@ compile_mx8ulp() {
    fi
 }
+compile_mx91() {
+    bbnote i.MX 91 boot binary build
+    compile_mx93
+}
 compile_mx93() {
    bbnote i.MX 93 boot binary build
    for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
@@ -156,13 +177,30 @@ compile_mx93() {
    fi
 }
+compile_mx95() {
+    bbnote i.MX 95 boot binary build
+    compile_mx93
+    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
+       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
+}
 do_compile() {
    # mkimage for i.MX8
    # Copy TEE binary to SoC target folder to mkimage
    if ${DEPLOY_OPTEE}; then
        cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}
+        if ${DEPLOY_OPTEE_STMM}; then
+            # Copy tee.bin to tee.bin-stmm
+            cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}/tee.bin-stmm
+        fi
    fi
-   for type in ${UBOOT_CONFIG}; do
+    # Copy OEI firmware to SoC target folder to mkimage
+    if [ "${OEI_ENABLE}" = "YES" ]; then
+        cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
+    fi
+    for type in ${UBOOT_CONFIG}; do
        if [ "${@d.getVarFlags('UBOOT_DTB_NAME')}" = "None" ]; then
            UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}"
        else
@@ -185,18 +223,30 @@ do_compile() {
                    UBOOT_DTB_NAME_EXTRA="${dtb_name}"
                fi
                UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}"
-                BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
+                BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
                for target in ${IMXBOOT_TARGETS}; do
                    compile_${SOC_FAMILY}
-                    if [ "$target" = "flash_linux_m4_no_v2x" ]; then
+                    case $target in
+                    *no_v2x)
                        # Special target build for i.MX 8DXL with V2X off
                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}"
                        make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME_EXTRA} flash_linux_m4
-                    else
+                        ;;
-                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${target}"
+                    *stmm_capsule)
-                        make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME_EXTRA} ${target}
+                        # target for flash_evk_stmm_capsule or
-                    fi
+                        # flash_singleboot_stmm_capsule
+                        cp ${RECIPE_SYSROOT_NATIVE}/${bindir}/mkeficapsule ${BOOT_STAGING}
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${target}"
+                        cp ${DEPLOY_DIR_IMAGE}/CRT.* ${BOOT_STAGING}
+                        make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target}
+                        ;;
+                    *)
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} ${target}"
+                        make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} dtbs=${UBOOT_DTB_NAME} ${target}
+                        ;;
+                    esac
                    if [ -e "${BOOT_STAGING}/flash.bin" ]; then
                        cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target}
                    fi
@@ -224,7 +274,7 @@ do_install () {
        bbnote "UBOOT_CONFIG = $type"
        UBOOT_CONFIG_EXTRA="$type"
-        BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
+        BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
        for target in ${IMXBOOT_TARGETS}; do
            install -m 0644 ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} ${D}/boot/
@@ -279,6 +329,10 @@ deploy_mx8ulp() {
    fi
 }
+deploy_mx91() {
+    deploy_mx93
+}
 deploy_mx93() {
    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
@@ -294,6 +348,12 @@ deploy_mx93() {
    fi
 }
+deploy_mx95() {
+    deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
+                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
+}
 do_deploy() {
    deploy_${SOC_FAMILY}
@@ -301,13 +361,27 @@ do_deploy() {
    if ${DEPLOY_OPTEE}; then
       install -m 0644 ${DEPLOY_DIR_IMAGE}/tee.bin ${DEPLOYDIR}/${BOOT_TOOLS}
    fi
+    # copy oei to deploy path
+    if [ "${OEI_ENABLE}" = "YES" ]; then
+        install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
+    fi
    # copy makefile (soc.mak) for reference
    install -m 0644 ${BOOT_STAGING}/soc.mak                  ${DEPLOYDIR}/${BOOT_TOOLS}
+    # copy stmm files to deploy path
+    if ${DEPLOY_OPTEE_STMM}; then
+        install -m 0644 ${BOOT_STAGING}/tee.bin-stmm         ${DEPLOYDIR}/${BOOT_TOOLS}
+        install -m 0644 ${BOOT_STAGING}/capsule1.bin         ${DEPLOYDIR}/${BOOT_TOOLS}
+        install -m 0644 ${BOOT_STAGING}/CRT.*                ${DEPLOYDIR}/${BOOT_TOOLS}
+        install -m 0755 ${BOOT_STAGING}/mkeficapsule         ${DEPLOYDIR}/${BOOT_TOOLS}
+    fi
    for type in ${UBOOT_CONFIG}; do
        UBOOT_CONFIG_EXTRA="$type"
        UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}"
-        BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
+        BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
        if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} ] ; then
            install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
@@ -326,9 +400,9 @@ do_deploy() {
            install -m 0644 ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} ${DEPLOYDIR}
        done
-        # The first UBOOT_CONFIG listed will be the ${BOOT_NAME} binary
+        # The first UBOOT_CONFIG listed will be the imx-boot binary
-        if [ ! -f "${DEPLOYDIR}/${UUU_BOOTLOADER}" ]; then
+        if [ ! -f "${DEPLOYDIR}/imx-boot" ]; then
-            ln -sf ${BOOT_CONFIG_MACHINE_EXTRA}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}
+            ln -sf ${BOOT_CONFIG_MACHINE_EXTRA}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/imx-boot
        else
            bbwarn "Use custom wks.in for $UBOOT_CONFIG = $type"
        fi
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index fb3df750a..3389b5b5e 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,14 +1,12 @@
-# Copyright 2017-2022 NXP
+# Copyright 2017-2025 NXP
 DEPENDS = "zlib-native openssl-native"
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
           file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.12.3_1.0.0"
-SRCREV = "cbb99377cc2bb8f7cf213794c030e1c60423ef1f"
+SRCREV = "9e60b1f7a87a6397cf8db10e07293075f489e974"
-S = "${WORKDIR}/git"
 BOOT_TOOLS = "imx-boot-tools"
 SYSROOT_DIRS += "/boot"
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
index 7dc2e593e..42e8f6e19 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
@@ -1,17 +1,18 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2022 NXP
+# Copyright (C) 2017-2024 NXP
 DESCRIPTION = "i.MX System Controller Firmware"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 SECTION = "BSP"
 inherit fsl-eula-unpack pkgconfig deploy
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI[sha256sum] = "392f1e5cdf1c8d7ed75409a2c46b00a332ace677f0e2700b587fe9ae800a1ff3"
+IMX_SRCREV_ABBREV = "654907b"
-SRC_URI[md5sum] = "d608eb2b3d312da1dbde55b8514c1e0f"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f"
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
@@ -24,6 +25,9 @@ symlink_name = "scfw_tcm.bin"
 BOOT_TOOLS = "imx-boot-tools"
+LDFLAGS:remove = "-fuse-ld=lld"
+LDFLAGS:append = " -fuse-ld=bfd"
 do_compile[noexec] = "1"
 do_install[noexec] = "1"
@@ -38,8 +42,4 @@ INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-LDFLAGS:remove = "-fuse-ld=lld"
-DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"
 COMPATIBLE_MACHINE = "(mx8qm-generic-bsp|mx8qxp-generic-bsp|mx8dxl-generic-bsp|mx8dx-generic-bsp)"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index b0296e977..fe366aacb 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -8,20 +8,18 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011"
 DEPENDS = "zlib"
-SRCBRANCH = "imx_5.4.70_2.3.11"
+SRCBRANCH = "lf-6.6.3_1.0.0"
 SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \
           file://0001-Makefile-Fix-LIBDIR-for-multilib.patch \
           file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch \
           file://0001-add-v2x_test-to-the-installed-binaries.patch \
           file://0001-Fix-return-value-of-void-functions.patch"
-SRCREV = "aa8d62900c41cc779c11fe4e6f58b40c3c9f82f0"
+SRCREV = "273553f207425f773400be7a7f3a7c425d892d6f"
-S = "${WORKDIR}/git"
 TARGET_CC_ARCH += "${LDFLAGS}"
 do_install () {
-        oe_runmake DESTDIR=${D} BINDIR=${bindir} LIBDIR=${libdir} install
+    oe_runmake DESTDIR=${D} BINDIR=${bindir} LIBDIR=${libdir} install
 }
 COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
index f7dadea57..2710297d6 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
@@ -1,18 +1,19 @@
-# Copyright 2019-2022 NXP
+# Copyright 2019-2024 NXP
 SUMMARY = "NXP i.MX SECO firmware"
 DESCRIPTION = "Firmware for i.MX Security Controller Subsystem"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "b722a534c4d3cc90270e05eaa812514d"
+SRC_URI[sha256sum] = "bd8dc01966076836aabff53f2463295294166595006e1db430db21b6ffa6b667"
-SRC_URI[sha256sum] = "c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df"
+IMX_SRCREV_ABBREV = "0333596"
+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
new file mode 100644
index 000000000..525824f79
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -0,0 +1,29 @@
+SUMMARY = "NXP i.MX Secure Enclave Userspace Library"
+DESCRIPTION = "NXP i.MX Secure Enclave Userspace Library"
+SECTION = "base"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
+DEPENDS = "openssl"
+inherit systemd
+SRC_URI = "git://github.com/NXP/imx-secure-enclave.git;protocol=https;branch=lf-6.6.52_2.2.0"
+SRCREV = "dffbb844e86f4a49058ffbb40548474059969c27"
+PV = "lf-6.6.52_2.2.0"
+EXTRA_OEMAKE += "PLAT=ele"
+TARGET_CC_ARCH += "${LDFLAGS}"
+do_install () {
+    oe_runmake DESTDIR=${D} install
+    rm -rf ${D}/usr/share
+}
+SYSTEMD_AUTO_ENABLE = "disable"
+SYSTEMD_SERVICE:${PN} = "nvm_daemon.service"
+COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 930cdf949..46a00d4fc 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -20,10 +20,8 @@ PV = "7.0+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
           file://memtool_profile"
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.12.3_1.0.0"
-SRCREV = "8a1fa37664a1e470cf86f1185c08e265e4602a9b"
+SRCREV = "92a497313016bfa536d561e13fcbad2d273ded4c"
-S = "${WORKDIR}/git"
 inherit module-base use-imx-headers
@@ -40,6 +38,7 @@ PLATFORM:mx7d-nxp-bsp  = "IMX7D"
 PLATFORM:mx7ulp-nxp-bsp = "IMX7D"
 PLATFORM:mx8-nxp-bsp = "IMX8"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
+PLATFORM:mx91-nxp-bsp = "IMX8"
 PLATFORM:mx93-nxp-bsp = "IMX8ULP"
 PLATFORM:mx95-nxp-bsp = "IMX8"
@@ -73,11 +72,11 @@ do_install() {
               PLATFORM=${PLATFORM} \
               install
-    if [ -e ${WORKDIR}/clocks.sh ]; then
+    if [ -e ${UNPACKDIR}/clocks.sh ]; then
-        install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
+        install -m 755 ${UNPACKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
    fi
    install -d -m 0755 ${D}${ROOT_HOME}/
-    install -m 0644 ${WORKDIR}/memtool_profile ${D}${ROOT_HOME}/.profile
+    install -m 0644 ${UNPACKDIR}/memtool_profile ${D}${ROOT_HOME}/.profile
 }
 FILES:${PN} += "/unit_tests ${ROOT_HOME}/.profile"
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index 49fc15581..d373e27e3 100644
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -6,15 +6,15 @@ DEPENDS = "virtual/kernel dosfstools-native"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-inherit autotools-brokensep
 PR = "r1"
 PV = "0.5.1+git${SRCPV}"
 SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master"
-SRCREV = "9b4adc0cde346fbae743dc21fcf5115488307b83"
+SRCREV = "25f65e10368aa07056f9536e88ed911ac7f38f99"
-S = "${WORKDIR}/git"
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
 FILES:${PN} += "/linuxrc /fat"
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
new file mode 100644
index 000000000..8d017ab71
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
@@ -0,0 +1,39 @@
+From e7f6097c9e7cb30f130502cc4804e1a1b01342de Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Wed, 7 May 2025 16:13:38 +0000
+Subject: [PATCH] base_type.h: make header compatible with c23
+With C23 bool, true and false are built in keywords and cannot be
+redefined.
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ usr/include/hantro_VC8000E_enc/base_type.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/usr/include/hantro_VC8000E_enc/base_type.h b/usr/include/hantro_VC8000E_enc/base_type.h
+index 282fc81b8eba..af4212eed2bd 100755
+--- a/usr/include/hantro_VC8000E_enc/base_type.h
+++ b/usr/include/hantro_VC8000E_enc/base_type.h
+@@ -67,6 +67,9 @@ typedef       unsigned int        UInt;
+ #define HANTRO_FALSE 0
+ #define HANTRO_TRUE  1
+ 
+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
+/* bool, true and false are keywords.  */
+#else
+ #ifndef bool
+ typedef enum
+ {
+@@ -74,6 +77,7 @@ typedef enum
+   true  = HANTRO_TRUE
+ } bool;
+ #endif
+#endif
+ 
+ enum
+ {
+-- 
+2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
index 26ebf1816..68c2a4979 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
@@ -2,16 +2,19 @@
 DESCRIPTION = "i.MX VC8000E Encoder library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 inherit fsl-eula-unpack
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = " \
+    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+    file://0001-base_type.h-make-header-compatible-with-c23.patch \
+"
+IMX_SRCREV_ABBREV = "c0244a1"
-S = "${WORKDIR}/${BPN}-${PV}"
+SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
-SRC_URI[md5sum] = "192b354d1c21836dc7338606e60b45ae"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa"
 # 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.1.6.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
index f603190be..940b9fa41 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
@@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
 DEPENDS = "imx-vpu-hantro"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
-SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.tar.gz"
-SRC_URI[md5sum] = "23997361dab3054e5a3757a15d33db16"
+IMX_SRCREV_ABBREV = "3200e68"
-SRC_URI[sha256sum] = "ac2b60fb754792eedcfdfc8cf59663cfeaedc402857eff13ac97a911d2c65801"
+SRC_URI[sha256sum] = "e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535"
+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/0001-basetype.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
new file mode 100644
index 000000000..bbfec172a
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
@@ -0,0 +1,38 @@
+From e39a6602817e4221ae09ac3d520ca6a0d94814dc Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Wed, 7 May 2025 16:13:38 +0000
+Subject: [PATCH] basetype.h: make header compatible with c23
+With C23 bool, true and false are built in keywords and cannot be
+redefined.
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ h1_encoder/software/inc/basetype.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/h1_encoder/software/inc/basetype.h b/h1_encoder/software/inc/basetype.h
+index 55e46a195b3b..6655ec54481b 100755
+--- a/h1_encoder/software/inc/basetype.h
+++ b/h1_encoder/software/inc/basetype.h
+@@ -66,12 +66,16 @@ typedef size_t ptr_t;
+ #define PRT_PTR "x"
+ #endif
+ 
+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
+/* bool, true and false are keywords.  */
+#else
+ #ifndef __cplusplus
+ typedef enum {
+         false   = 0,
+         true    = 1
+ } bool;
+ #endif
+#endif
+ 
+ #else /* __symbian__ or __win__ or whatever, customize it to suit well */
+ 
+-- 
+2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
new file mode 100644
index 000000000..da1af2b9c
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
@@ -0,0 +1,90 @@
+From 0c5bdd12a6f3ba73e605656828bf429966a997ef Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Wed, 7 May 2025 13:25:26 +0000
+Subject: [PATCH] test: md5: convert to ansi c
+GCC 15 no longer likes this K&R style function declarations.
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ decoder_sw/software/test/common/swhw/md5.c | 15 +++++----------
+ decoder_sw/software/test/common/swhw/md5.h |  8 ++++----
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+diff --git a/decoder_sw/software/test/common/swhw/md5.c b/decoder_sw/software/test/common/swhw/md5.c
+index c3334bf751fd..20014fbdf268 100755
+--- a/decoder_sw/software/test/common/swhw/md5.c
+++ b/decoder_sw/software/test/common/swhw/md5.c
+@@ -42,8 +42,7 @@
+ /*
+  * Note: this code is harmless on little-endian machines.
+  */
+-void ByteReverse(buf, longs) unsigned char *buf;
+-unsigned longs;
+void ByteReverse(unsigned char *buf, unsigned longs)
+ {
+   uint32 t;
+   do {
+@@ -59,7 +58,7 @@ unsigned longs;
+  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+  * initialization constants.
+  */
+-void MD5Init(ctx) struct MD5Context *ctx;
+void MD5Init(struct MD5Context *ctx)
+ {
+   ctx->buf[0] = 0x67452301;
+   ctx->buf[1] = 0xefcdab89;
+@@ -74,9 +73,7 @@ void MD5Init(ctx) struct MD5Context *ctx;
+  * Update context to reflect the concatenation of another buffer full
+  * of bytes.
+  */
+-void MD5Update(ctx, buf, len) struct MD5Context *ctx;
+-unsigned char *buf;
+-unsigned len;
+void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len)
+ {
+   uint32 t;
+ 
+@@ -124,8 +121,7 @@ unsigned len;
+  * Final wrapup - pad to 64-byte boundary with the bit pattern
+  * 1 0* (64-bit count of bits processed, MSB-first)
+  */
+-void MD5Final(digest, ctx) unsigned char digest[16];
+-struct MD5Context *ctx;
+void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
+ {
+   unsigned count;
+   unsigned char *p;
+@@ -186,8 +182,7 @@ struct MD5Context *ctx;
+  * reflect the addition of 16 longwords of new data.  MD5Update blocks
+  * the data and converts bytes into longwords for this routine.
+  */
+-void MD5Transform(buf, in) uint32 buf[4];
+-uint32 in[16];
+void MD5Transform(uint32 buf[4], uint32 in[16])
+ {
+   register uint32 a, b, c, d;
+ 
+diff --git a/decoder_sw/software/test/common/swhw/md5.h b/decoder_sw/software/test/common/swhw/md5.h
+index 516400236606..c1d773093b66 100755
+--- a/decoder_sw/software/test/common/swhw/md5.h
+++ b/decoder_sw/software/test/common/swhw/md5.h
+@@ -76,10 +76,10 @@ struct MD5Context {
+   unsigned char in[64];
+ };
+ 
+-extern void MD5Init();
+-extern void MD5Update();
+-extern void MD5Final();
+-extern void MD5Transform();
+extern void MD5Init(struct MD5Context *ctx);
+extern void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len);
+extern void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
+extern void MD5Transform(uint32 buf[4], uint32 in[16]);
+ 
+ /*
+  * This is needed to make RSAREF happy on some MS-DOS compilers.
+-- 
+2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb
deleted file mode 100644
index 0757a7fb5..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2017-2020 NXP
-DESCRIPTION = "i.MX Hantro VPU library"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
-PROVIDES = "virtual/imxvpu"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "81b4eb801349a0c198b7cc43eb8b6097"
-SRC_URI[sha256sum] = "e868e12945b4f217e2e0511fdc2587875d6c9124e8673b67f1e7de367ff5012f"
-inherit fsl-eula-unpack use-imx-headers
-PARALLEL_MAKE="-j 1"
-PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
-PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
-PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
-EXTRA_OEMAKE = " \
-    CROSS_COMPILE="${HOST_PREFIX}" \
-    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
-    PLATFORM="${PLATFORM}" \
-"
-do_install () {
-    oe_runmake install DEST_DIR="${D}"
-}
-FILES:${PN} += "/unit_tests"
-RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
new file mode 100644
index 000000000..d766e0191
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
@@ -0,0 +1,49 @@
+# Copyright (C) 2017-2020 NXP
+DESCRIPTION = "i.MX Hantro VPU library"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+PROVIDES = "virtual/imxvpu"
+SRC_URI = " \
+    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+    file://0001-test-md5-convert-to-ansi-c.patch \
+    file://0001-basetype.h-make-header-compatible-with-c23.patch \
+"
+IMX_SRCREV_ABBREV = "194a305"
+SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack use-imx-headers
+PARALLEL_MAKE = "-j 1"
+PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
+PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
+PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
+#| ../../source/h264high/h264decapi.c:1803:22: error: assignment to 'const u8 *' {aka 'const unsigned char *'} from incompatible pointer type 'u32 *' {aka 'unsigned int *'} [-Wincompatible-pointer-types]
+#|  1803 |             ref_data = ref.virtual_address;
+#| ../../source/h264high/h264decapi.c:2086:22: error: assignment to 'const u8 *' {aka 'const unsigned char *'} from incompatible pointer type 'u32 *' {aka 'unsigned int *'} [-Wincompatible-pointer-types]
+#|  2086 |             ref_data = ref.virtual_address;
+CFLAGS += " -Wno-error=incompatible-pointer-types"
+EXTRA_OEMAKE = " \
+    CROSS_COMPILE="${HOST_PREFIX}" \
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
+    PLATFORM="${PLATFORM}" \
+"
+do_install () {
+    oe_runmake install DEST_DIR="${D}"
+}
+FILES:${PN} += "/unit_tests"
+RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
index 553f39930..fc90cdab7 100644
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
@@ -11,7 +11,6 @@ PROVIDES = "virtual/imxvpu"
 PE = "1"
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "6d6302189a6704874375afe62a65def0"
 SRC_URI[sha256sum] = "87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127"
 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.24.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb
index 0ab440748..aebb28bb7 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb
@@ -1,17 +1,23 @@
-# Copyright 2020-2023 NXP
+# Copyright (C) 2020-2024 NXP
 DESCRIPTION = "Basler camera binary drivers"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+IMX_SRCREV_ABBREV = "d1f506a"
 inherit fsl-eula-unpack
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI[sha256sum] = "49d1b3691d18e2ba5f43a6e2c59ac16767b6e077a118cafec7f51293d6bf30f3"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
-SRC_URI[md5sum] = "31d716e1f40c248556e5a8e6b467ba71"
+do_compile[noexec] = "1"
-SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf"
 do_install() {
+    oe_runmake install INSTALL_DIR=${D}
    dest_dir=${D}/opt/imx8-isp/bin
    install -d ${D}/${libdir}
    install -d $dest_dir
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch b/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch
deleted file mode 100644
index 3f04000cf..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 15aae364fb52df30e4a49e73e2048fdc633e6868 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Sun, 8 Oct 2023 09:15:54 -0300
-Subject: [PATCH] cpp-netlib: parsers.ipp: add missing include
-With the update to boost from 1.82.0 -> 1.83.0 we now get compiler errors:
-| .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:58:3: error: 'u8_to_u32_iterator' was not declared in this scope
-Add the missing explicit include. Before the file was indirectly included from qi.hpp:
-| In file included from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/regex/pending/unicode_iterator.hpp:27,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/utf8.hpp:15,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/info.hpp:17,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/domain.hpp:16,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/meta_compiler.hpp:15,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action/action.hpp:14,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action.hpp:14,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi.hpp:14,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/include/qi.hpp:16,
-|                  from .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:5,
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- .../boost/network/protocol/http/server/impl/parsers.ipp          | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
-index c31e60e..2b83fbe 100755
--- a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
-+++ b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
-@@ -13,6 +13,7 @@
- #include <tuple>
- #include <boost/fusion/include/std_tuple.hpp>
- #include <boost/network/protocol/http/message/header.hpp>
-+#include <boost/regex/pending/unicode_iterator.hpp>
- 
- #ifdef BOOST_NETWORK_NO_LIB
- #ifndef BOOST_NETWORK_INLINE
-- 
-2.35.3
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb
deleted file mode 100644
index 9e0f02656..000000000
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2023 NXP
-DESCRIPTION = "i.MX Verisilicon Software ISP"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
-DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 patchelf-native"
-SRC_URI = " \
-    ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
-    file://0001-cpp-netlib-parsers.ipp-add-missing-include.patch \
-"
-SRC_URI[sha256sum] = "34b23f5b9f0856a8f5722e339a7ad4ccf4d99614788598306ff8b20093c1e846"
-inherit fsl-eula-unpack cmake systemd use-imx-headers
-# Build the sub-folder appshell
-OECMAKE_SOURCEPATH = "${S}/appshell"
-# Use make instead of ninja
-OECMAKE_GENERATOR = "Unix Makefiles"
-# Workaround for linking issues seen with gold linker
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
-EXTRA_OECMAKE += " \
-    -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
-    -DCMAKE_BUILD_TYPE=release \
-    -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-    -DCMAKE_INSTALL_LIBDIR=${libdir} \
-    -DISP_VERSION=ISP8000NANO_V1802 \
-    -DPLATFORM=ARM64 \
-    -DAPPMODE=V4L2 \
-    -DTUNINGEXT=1 \
-    -DQTLESS=1 \
-    -DFULL_SRC_COMPILE=1 \
-    -DWITH_DRM=1 \
-    -DWITH_DWE=1 \
-    -DSERVER_LESS=1 \
-    -DSUBDEV_V4L2=1 \
-    -DENABLE_IRQ=1 \
-    -DPARTITION_BUILD=0 \
-    -D3A_SRC_BUILD=0 \
-    -DIMX_G2D=ON \
-    -Wno-dev \
-"
-do_configure:prepend () {
-    # FIXME: Should be rebuild.
-    patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/units/cam_device/proprietories/lib/libcam_device.so
-    patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/mediacontrol/lib/arm-64/fpga/libcam_device.so
-}
-do_install() {
-    # FIXME: provided by the basler-camera package, do not install them here additionally
-    rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json
-    install -d ${D}/${libdir}
-    install -d ${D}/${includedir}
-    install -d ${D}/opt/imx8-isp/bin
-    install -d ${D}/opt/imx8-isp/bin/dewarp_config
-    cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/tuningext ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir}
-    cp -r ${B}/generated/release/include/* ${D}/${includedir}
-    cp -r ${S}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin
-    cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin
-    cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin
-    chmod +x ${D}/opt/imx8-isp/bin/run.sh
-    chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-      install -d ${D}${systemd_system_unitdir}
-      install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
-    fi
-}
-# The build contains a mix of versioned and unversioned libraries, so
-# the default packaging configuration needs some modification so that
-# unversioned .so libraries go to the main package and versioned .so
-# symlinks go to -dev.
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
-FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
-FILES_SOLIBS_VERSIONED = " \
-    ${libdir}/libcppnetlib-client-connections.so \
-    ${libdir}/libcppnetlib-server-parsers.so \
-    ${libdir}/libcppnetlib-uri.so \
-    ${libdir}/libjsoncpp.so \
-    ${libdir}/libos08a20.so \
-"
-RDEPENDS:${PN} = "libdrm"
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
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.1.bb
new file mode 100644
index 000000000..28ab57b74
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb
@@ -0,0 +1,99 @@
+# Copyright (C) 2020-2024 NXP
+DESCRIPTION = "i.MX Verisilicon Software ISP"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
+SRC_URI = " \
+    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+"
+IMX_SRCREV_ABBREV = "327f21d"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+SRC_URI[sha256sum] = "f57c6fe1c2dd1c8e5991a625d0b3a1dbfdfe6d39a1a116a904d543faa0f4f6f0"
+inherit fsl-eula-unpack cmake systemd use-imx-headers
+PACKAGECONFIG = ""
+# Note: building with tuningext fails with boost 1.87.
+# (update to 1.87 with walnascar)
+PACKAGECONFIG[tuningext] = "-DTUNINGEXT=1,-DTUNINGEXT=0"
+# Build the sub-folder appshell
+OECMAKE_SOURCEPATH = "${S}/appshell"
+# Use make instead of ninja
+OECMAKE_GENERATOR = "Unix Makefiles"
+# Workaround for linking issues seen with gold linker
+LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
+EXTRA_OECMAKE += " \
+    -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
+    -DCMAKE_BUILD_TYPE=release \
+    -DISP_VERSION=ISP8000NANO_V1802 \
+    -DPLATFORM=ARM64 \
+    -DTUNINGEXT=1 \
+    -DQTLESS=1 \
+    -DFULL_SRC_COMPILE=1 \
+    -DWITH_DRM=1 \
+    -DWITH_DWE=1 \
+    -DSUBDEV_V4L2=1 \
+    -DPARTITION_BUILD=0 \
+    -D3A_SRC_BUILD=0 \
+    -DIMX_G2D=ON \
+    -Wno-dev \
+"
+do_configure:prepend () {
+    # FIXME: should be rebuild.
+    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/bin/isp_media_server
+    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/lib/libmedia_server.so
+    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/tuningext/install/tuningext
+    # FIXME: Should be rebuild.
+    patchelf --replace-needed libtinyxml2.so.10 libtinyxml2.so.11 ${S}/appshell/shell_libs/ispcore/ARM64/libcam_device.so
+}
+do_install() {
+    # 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
+    fi
+    oe_runmake -f ${S}/Makefile install INSTALL_DIR=${D} SOURCE_DIR=${S}
+    if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
+        rm ${D}/opt/imx8-isp/bin/tuningext
+    fi
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
+    fi
+}
+# The build contains a mix of versioned and unversioned libraries, so
+# the default packaging configuration needs some modification so that
+# unversioned .so libraries go to the main package and versioned .so
+# symlinks go to -dev.
+FILES_SOLIBSDEV = ""
+FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
+FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
+FILES_SOLIBS_VERSIONED = " \
+    ${libdir}/libcppnetlib-client-connections.so \
+    ${libdir}/libcppnetlib-server-parsers.so \
+    ${libdir}/libcppnetlib-uri.so \
+    ${libdir}/libos08a20.so \
+"
+RDEPENDS:${PN} = "libdrm"
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
index b160c31db..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} \
@@ -61,7 +58,9 @@ PACKAGECONFIG:append:imxpxp           = " pxp"
 # former is not available pre-5.6. Out of the dma-heaps, we
 # pick the uncached one by default (see above).
 PACKAGECONFIG:append:mx8-nxp-bsp      = " dma-heap-uncached"
-PACKAGECONFIG:append:mx8m-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mq-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mm-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mp-nxp-bsp     = " dwl"
 HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2"
@@ -82,7 +81,7 @@ PACKAGECONFIG[dma-heap-uncached] = "--with-dma-heap-allocator=yes ${UNCACHED_DMA
 # Using do_install_ptest_base instead of do_install_ptest, since
 # the default do_install_ptest_base is hardcoded to expect Makefiles.
 do_install_ptest_base() {
-    install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
+    install -D ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
    install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH}
 }
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 568096c44..9e9f8d409 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 = "8efeeac253ff780cbf1382ff40e09436d65e220d"
+SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc"
-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 33648d1e2..582fb1e46 100644
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -1,14 +1,12 @@
 DESCRIPTION = "qe microcode binary"
 SECTION = "qe-ucode"
 LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=c62f8109b4df15ca37ceeb5e4943626c"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c62f8109b4df15ca37ceeb5e4943626c"
 inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1;protocol=https"
-SRCREV= "57401f6dff6507055558eaa6838116baa8a2fd46"
+SRCREV = "c89d7843943fd3bd52aa5f1ff7a91200a2f7f63b"
-S = "${WORKDIR}/git"
 do_install () {
       install -d ${D}/boot
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 5721313b2..b73dd9753 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,17 +8,15 @@ DEPENDS += "tcl-native"
 inherit deploy siteinfo
 SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1"
-SRCREV = "020dcf0645959afec6705f518e8350476891ef4f"
+SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4"
-S = "${WORKDIR}/git"
 export PYTHON = "${USRBINPATH}/python3"
-M="${@d.getVar('MACHINE').replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}"
+M = "${@d.getVar('MACHINE').replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}"
-BOARD_TARGETS="${M}"
+BOARD_TARGETS = "${M}"
-BOARD_TARGETS:ls2088ardb="${M} ${M}_rev1.1"
+BOARD_TARGETS:ls2088ardb = "${M} ${M}_rev1.1"
-BOARD_TARGETS:ls1088ardb-pb="ls1088ardb"
+BOARD_TARGETS:ls1088ardb-pb = "ls1088ardb"
 BOARD_TARGETS:lx2160ardb = "${M} ${M}_rev2"
 BOARD_TARGETS:lx2160ardb-rev2 = "lx2160ardb_rev2"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
index b270dfd74..9cc6b958d 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native"
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
-SRCREV = "1a2bdc16b79a6f9c31829ede1bbf4063ccea6e54"
+SRCREV = "aa4bc52d08c342df83e3c576e2c108d7c8816e0e"
-SRCBRANCH = "2024.04+fslc"
+SRCBRANCH = "2025.01+fslc"
-PV = "2024.04+git${SRCPV}"
+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-fslc-mxsboot_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
index b7e4ca760..b7e4ca760 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
index eba8876aa..4dc698219 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
@@ -6,8 +6,6 @@ order to provide support for some backported features and fixes, or because it \
 was submitted for revision and it takes some time to become part of a stable \
 version, or because it is not applicable for upstreaming."
-inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
 PROVIDES += "u-boot u-boot-mfgtool"
@@ -21,5 +19,8 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
                 HOSTLDFLAGS="${BUILD_LDFLAGS}" \
                 HOSTSTRIP=true'
+inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
+inherit uuu_bootloader_tag
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
index e23235627..9640ba1de 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
@@ -3,10 +3,11 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
-SRCBRANCH = "lf_v2023.04"
+UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
-LOCALVERSION ?= "-imx_v2023.04_6.6.3-1.0.0"
+SRCBRANCH = "lf_v2024.04"
-SRCREV = "f8a2983ec83afd43731d905b4ff0ffd57b57f2f0"
+LOCALVERSION ?= "-${SRCBRANCH}"
+SRCREV = "e3219a5a73445219df605d1492687918d488055c"
 DEPENDS += " \
    bc-native \
@@ -17,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_2023.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
index 0e7c467b9..695987801 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2018 (C) O.S. Systems Software LTDA.
-# Copyright (C) 2017-2023 NXP
+# Copyright 2017-2024 NXP
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
@@ -9,15 +9,12 @@ PROVIDES += "u-boot u-boot-mfgtool"
 inherit uuu_bootloader_tag
-UUU_BOOTLOADER                          = ""
+# The UUU tag goes on the boot partition. For 8+, the boot partition image
-UUU_BOOTLOADER:mx6-generic-bsp          = "${UBOOT_BINARY}"
+# is imx-boot, so disable UUU-tagging here
-UUU_BOOTLOADER:mx7-generic-bsp          = "${UBOOT_BINARY}"
+UUU_BOOTLOADER:mx8-generic-bsp = ""
-UUU_BOOTLOADER_TAGGED                   = ""
+UUU_BOOTLOADER:mx9-generic-bsp = ""
-UUU_BOOTLOADER_TAGGED:mx6-generic-bsp   = "u-boot-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_TAGGED:mx7-generic-bsp   = "u-boot-tagged.${UBOOT_SUFFIX}"
+TOOLCHAIN_OPTIONS:append = " -Wno-error=implicit-function-declaration"
-UUU_BOOTLOADER_UNTAGGED                 = ""
-UUU_BOOTLOADER_UNTAGGED:mx6-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_UNTAGGED:mx7-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
 do_deploy:append:mx8m-generic-bsp() {
    # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
@@ -57,6 +54,14 @@ do_deploy:append:mx8m-generic-bsp() {
        done
        unset  i
    fi
+    # Deploy CRT.* from u-boot for stmm
+    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
+}
+do_deploy:append:mx93-generic-bsp() {
+    # Deploy CRT.* from u-boot for stmm
+    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
 }
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
index c46eae331..c765cd2d7 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
@@ -15,9 +15,8 @@ LIC_FILES_CHKSUM = " \
 "
 SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1"
-SRCREV= "1c0116f3da250c5a52858c53efb8b38c0963f477"
+SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 PV:append = "+fslgit"
 LOCALVERSION = "+fsl"
diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index b001a325c..c0222a817 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315"
 inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https"
-SRCREV = "15deb924ff063007592ee647602dd454353f5aee"
+SRCREV = "55789d536850e00c6f2284fb28eaf21712cd276b"
-S = "${WORKDIR}/git"
 do_install () {
       if [ -d ${B}/${MACHINE} ]; then
diff --git a/recipes-core/udev/udev-rules-imx.bb b/recipes-core/udev/udev-rules-imx.bb
index 163f28350..57aff9bc8 100644
--- a/recipes-core/udev/udev-rules-imx.bb
+++ b/recipes-core/udev/udev-rules-imx.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SRC_URI = " file://10-imx.rules"
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 do_install () {
-        install -d ${D}${sysconfdir}/udev/rules.d
+    install -D -m 0644 ${UNPACKDIR}/10-imx.rules \
-        install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d/
+                       ${D}${sysconfdir}/udev/rules.d/10-imx.rules
 }
diff --git a/recipes-core/udev/udev-rules-qoriq.bb b/recipes-core/udev/udev-rules-qoriq.bb
index 1200527c7..792c32343 100644
--- a/recipes-core/udev/udev-rules-qoriq.bb
+++ b/recipes-core/udev/udev-rules-qoriq.bb
@@ -9,7 +9,6 @@ SRC_URI = "\
    file://74-ls1046a-xfi2-networking.rules \
    file://73-fsl-enetc-networking.rules \
 "
-S = "${WORKDIR}"
 RULE = "71-fsl-dpaa-persistent-networking.rules"
 RULE:e6500 = "72-fsl-dpaa-persistent-networking.rules"
@@ -26,7 +25,7 @@ RULE:ls1012a = ""
 do_install () {
    install -d ${D}${sysconfdir}/udev/rules.d/
    for r in ${RULE};do
-        install -m 0644 ${WORKDIR}/${r} ${D}${sysconfdir}/udev/rules.d/
+        install -m 0644 ${UNPACKDIR}/${r} ${D}${sysconfdir}/udev/rules.d/
    done
 }
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..20ba6b535 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -17,8 +17,6 @@ SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \
 SRCREV = "14fda5a42df6c72e890d6a97ff88c5852172604b"
-S = "${WORKDIR}/git"
 python() {
    d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', ''))
    pkgs = d.getVar('PACKAGES').split()
diff --git a/recipes-devtools/qemu/qemu.inc b/recipes-devtools/qemu/qemu.inc
index b8b5f318f..60686bde8 100644
--- a/recipes-devtools/qemu/qemu.inc
+++ b/recipes-devtools/qemu/qemu.inc
@@ -97,7 +97,7 @@ EXTRA_OECONF = " \
    ${PACKAGECONFIG_CONFARGS} \
    "
-export LIBTOOL="${HOST_SYS}-libtool"
+export LIBTOOL = "${HOST_SYS}-libtool"
 B = "${WORKDIR}/build"
diff --git a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
index 8d3458363..95bf4eb64 100644
--- a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
+++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "utility for security boot"
 SECTION = "cst"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e959d5d617e33779d0e90ce1d9043eff"
 DEPENDS += "openssl qoriq-cst-native"
 RDEPENDS:${PN} = "bash"
@@ -19,9 +19,7 @@ inherit kernel-arch
 SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \
           file://0001-tools-Mark-struct-input_field-file_field-extern.patch \
 "
-SRCREV = "af56e6c5c66dd2bc86a83b0bee8cb61b88d2120c"
+SRCREV = "e96dead3c339f6addb1600249be67e1884cdbcc5"
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"'
 CFLAGS:append = ' -Wno-deprecated-declarations'
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.165.bb
index 2b5feda10..61c3927ca 100644
--- a/recipes-devtools/uuu/uuu-bin_1.5.165.bb
+++ b/recipes-devtools/uuu/uuu-bin_1.5.165.bb
@@ -19,14 +19,12 @@ SRC_URI[Linux.sha256sum] = "f863bba022202361d19e5026be0af408d307f78d2dbf2c139fb7
 SRC_URI[Mac.sha256sum] = "62da0bd7e333931fba100823aa50133621c7e6047be0546bc12e29c0ea78a4d8"
 SRC_URI[Windows.sha256sum] = "013ed8bb45e21b971b6b3a5802c5f154733913714bece0b020cb770a809cd206"
-S = "${WORKDIR}"
 inherit allarch
 do_install() {
-    install -D -m 0755 ${WORKDIR}/uuu-${PV}     ${D}${libdir}/uuu/uuu
+    install -D -m 0755 ${UNPACKDIR}/uuu-${PV}     ${D}${libdir}/uuu/uuu
-    install -D -m 0755 ${WORKDIR}/uuu-${PV}_mac ${D}${libdir}/uuu/uuu_mac
+    install -D -m 0755 ${UNPACKDIR}/uuu-${PV}_mac ${D}${libdir}/uuu/uuu_mac
-    install -D -m 0644 ${WORKDIR}/uuu-${PV}.exe ${D}${libdir}/uuu/uuu.exe
+    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..c242c1911 100644
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/recipes-devtools/uuu/uuu_git.bb
@@ -11,8 +11,6 @@ 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/spir/spirv-headers_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
index 945f0879f..caaf2cd38 100644
--- a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
@@ -4,15 +4,15 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
-SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb"
+SRCREV = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 inherit cmake
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
index 690428829..6b0c0a3f7 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
@@ -7,15 +7,15 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0"
+SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 inherit cmake
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
index 01eb14b9f..24630d0db 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
@@ -11,9 +11,7 @@ LICENSE = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
-SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50"
+SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40"
-S = "${WORKDIR}/git"
 inherit cmake
@@ -21,7 +19,8 @@ FILES:${PN} += "${datadir}/vulkan"
 RDEPENDS:${PN} += "python3-core"
 # These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
index 01cbeafa3..089b46b34 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
@@ -9,10 +9,8 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https"
-SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0"
+SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229"
-S = "${WORKDIR}/git"
 REQUIRED_DISTRO_FEATURES = "vulkan"
@@ -36,7 +34,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
 RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
 # These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
index 7a7edc9eb..f5fe8523d 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
@@ -7,15 +7,13 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
-SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1"
+SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664"
-S = "${WORKDIR}/git"
 inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
 REQUIRED_DISTRO_FEATURES = "vulkan"
-DEPENDS += "vulkan-headers vulkan-loader"
+DEPENDS += "vulkan-headers vulkan-loader vulkan-volk"
 EXTRA_OECMAKE = "\
                 -DBUILD_TESTS=OFF \
@@ -31,6 +29,7 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
index 1e2a0aced..3068dd184 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
@@ -8,14 +8,12 @@ SECTION = "libs"
 LICENSE = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
-SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https"
-SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6"
+SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2"
-S = "${WORKDIR}/git"
 REQUIRED_DISTRO_FEATURES = "vulkan"
-DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang"
+DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
 # BUILD_TESTS            - Not required for OE builds
 # USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
@@ -42,7 +40,8 @@ FILES_SOLIBSDEV = ""
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools,
-# vulkan-validation-layers, spirv-headers, spirv-tools
+# vulkan-validation-layers, spirv-headers, spirv-tools,
+# vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-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..02790d47b 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -8,8 +8,6 @@ PR = "r1"
 SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1"
 SRCREV = "9fb916f255214013aa6003496c47bab0b5add2d9"
-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 7c0ec2706..219050b00 100644
--- a/recipes-dpaa2/dce/dce_git.bb
+++ b/recipes-dpaa2/dce/dce_git.bb
@@ -7,13 +7,11 @@ 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 \
      file://0001-support-user-merge.patch \
 "
-SRCREV = "9db9c08379aa89f45f514f4f3f0a8e8212198758"
+SRCREV = "88ef2e8c3845532ee64cea4349fd38fb2bd5f807"
 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 303aa8ff6..853dda9d7 100644
--- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
+++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
@@ -3,8 +3,8 @@ on an AIOP Tile using MC interfaces. This application enables the user to \
 fetch status of tile, load a valid ELF file and run it on a tile and get and set \
 time of day."
 SECTION = "dpaa2"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \
    file://0001-remove-libio.h.patch \
@@ -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.37.0.bb b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
index d18771590..3b5ae98ed 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.37.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
@@ -1,17 +1,16 @@
 SUMMARY = "DPAA2 Management Complex Firmware"
 LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=481d6288552113961a835bbabceb0c33"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0701845051a61f6012009d7d6d11b32b"
 inherit deploy
 INHIBIT_DEFAULT_DEPS = "1"
 SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;nobranch=1"
-SRCREV = "bb19f586b87b97878b4bd0d3e57da2ca40c5c69f"
+SRCREV = "7d82686272f8a60b803818bbc7c5396819ee3b06"
-S = "${WORKDIR}/git"
 REGLEX:ls2088a = "ls2088a"
+REGLEX:ls2080a = "ls2080a"
 REGLEX:ls1088a = "ls1088a"
 REGLEX:lx2160a = "lx216xa"
 REGLEX:lx2162a = "lx216xa"
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index 1d1aeffe2..0ea40ec69 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -1,13 +1,11 @@
 SUMMARY = "DPAA2 Resource Manager Tool"
 LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ec8d84e9cd4de287e290275d09db27f0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
 SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \
    file://disable-manpage-generation.patch \
 "
-SRCREV = "46604e41f4c7e54efa62503c6b4629321b21e056"
+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 2c695368e..93630a20c 100644
--- a/recipes-dpaa2/spc/spc_git.bb
+++ b/recipes-dpaa2/spc/spc_git.bb
@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=163b09a1c249a6ff2b28da1ceca2e0a8"
 DEPENDS = "libxml2 fmlib tclap"
 SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1"
-SRCREV = "d624b7809be48e4cf29a7bfa201028e4de1d1955"
+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" \
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-module_20.11.bb b/recipes-extended/dpdk/dpdk-module_20.11.bb
index 180b140ba..585e198ea 100644
--- a/recipes-extended/dpdk/dpdk-module_20.11.bb
+++ b/recipes-extended/dpdk/dpdk-module_20.11.bb
@@ -14,7 +14,7 @@ DEPENDS += "dpdk"
 export S
 export STAGING_KERNEL_DIR
 export STAGING_INCDIR
-export INSTALL_MOD_DIR="dpdk"
+export INSTALL_MOD_DIR = "dpdk"
 do_configure[noexec] = "1"
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/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index c230cc3a5..a955c8fd3 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 PROVIDES = "jailhouse"
 RPROVIDES:${PN} += "jailhouse"
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.6.52_2.2.0"
-SRCREV = "184a287f4c4c63a3842a3b582b5d700e0f9fd9a4"
+SRCREV = "44dd492a745cd8b8313fb6c7c03fb45a36d70e8a"
 IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
 SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
@@ -33,7 +33,6 @@ DEPENDS = " \
 inherit module bash-completion deploy setuptools3
-S = "${WORKDIR}/git"
 B = "${S}"
 JH_ARCH = "arm64"
diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index 731b7a234..347a8ef9a 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "PKCS library"
-LICENSE = "GPL-2.0-only & BSD"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625"
 SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \
@@ -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/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb
index 5b3ca7edc..bd788fdb5 100644
--- a/recipes-extended/merge-files/merge-files_1.0.bb
+++ b/recipes-extended/merge-files/merge-files_1.0.bb
@@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 inherit allarch
 SRC_URI = "file://merge"
-S = "${WORKDIR}"
 MERGED_DST ?= "${ROOT_HOME}"
 do_install () {
    install -d ${D}/${MERGED_DST}
-    find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \
+    find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \
    -exec cp -fr '{}' ${D}/${MERGED_DST}/ \;
-    find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \;
+    find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \;
 }
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 0c90d0c57..34bd5138e 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -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 3866dde48..c6bbc41df 100644
--- a/recipes-extended/secure-obj/secure-obj-module_git.bb
+++ b/recipes-extended/secure-obj/secure-obj-module_git.bb
@@ -1,11 +1,11 @@
 require secure-obj.inc
-LIC_FILES_CHKSUM = "file://../README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 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.inc b/recipes-extended/secure-obj/secure-obj.inc
index 64e4a6b71..16115ff03 100644
--- a/recipes-extended/secure-obj/secure-obj.inc
+++ b/recipes-extended/secure-obj/secure-obj.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Secure Object"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 DEPENDS = "openssl optee-os-qoriq optee-client-qoriq"
 RDEPENDS:${PN} = "bash libcrypto libssl"
@@ -11,7 +11,7 @@ inherit python3native
 LDFLAGS += "${TOOLCHAIN_OPTIONS}"
 SRC_URI = "git://github.com/nxp-qoriq/secure_obj;protocol=https;nobranch=1"
-SRCREV = "5ff1231f74b4b01744be95a3137a14ad0a483e61"
+SRCREV = "4706a6534ec09f9a46bfe305c5e49badca32b4c6"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/"
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 84ecea1ea..4d197f57c 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -1,9 +1,9 @@
 require secure-obj.inc
-LIC_FILES_CHKSUM = "file://README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
+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"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
@@ -17,14 +17,15 @@ CFLAGS += "${TOOLCHAIN_OPTIONS}"
 do_compile() {
        unset LDFLAGS
-        export TA_DEV_KIT_DIR="${RECIPE_SYSROOT}/usr/include/optee/export-user_ta"
+        export TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta/
        export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr" 
+        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr"
-        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do        
+        export OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules
+        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do
            cd  ${APP}
            oe_runmake
            cd ..
-        done       
+        done
 }
 do_install() {
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 4ed2ceb39..45e9365da 100644
--- a/recipes-extended/testfloat/testfloat_2a.bb
+++ b/recipes-extended/testfloat/testfloat_2a.bb
@@ -10,15 +10,13 @@ SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \
                              file://TestFloat-powerpc-E500v2-SPE-1.patch \
                              file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
                            "
-SRC_URI[TestFloat.md5sum] = "4dc889319ae1e0c5381ec511f784553a"
 SRC_URI[TestFloat.sha256sum] = "84d14aa42adefbda2ec9708b42946f7fa59f93689b042684bd027863481f8e4e"
-SRC_URI[SoftFloat.md5sum] = "b4a58b5c941f1a2317e4c2500086e3fa"
 SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515d56c5f18f2febf81"
-S = "${WORKDIR}/TestFloat-2a"
+S = "${UNPACKDIR}/TestFloat-2a"
 do_unpack2(){
-    mv ${WORKDIR}/SoftFloat-2b ${S}/SoftFloat-2b
+    mv ${UNPACKDIR}/SoftFloat-2b ${S}/SoftFloat-2b
    cd ${S}
    if [ -n "$(which fromdos)" ];then
        find -type f -exec fromdos {} \;
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 f38e8a6ed..addd1c376 100644
--- a/recipes-fsl/mcore-demos/README
+++ b/recipes-fsl/mcore-demos/README
@@ -1,14 +1,11 @@
 The M4 demo app version of each SoCs are followed:
-* 2.14.0 -- i.MX 7ULP, 8MQ
+* 2.16.000 -- i.MX 7ULP, 8MQ, 8MM
-* 2.14.1 -- i.MX 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.14.0 -- i.MX 8MNULite, 8MN
+* 2.16.000 --  i.MX 8MP , 8MNULite, 8MN
-* 2.14.1 -- i.MX 8MP
+* 24.12.00 --  i.MX95
-* 2.15.000 -- i.MX95
 The M33 demo app version of each SoCs are followed:
-* 2.14.1 -- i.MX 8ULP
+* 2.16.000 --  i.MX 8ULP, i.MX 93
-* 2.15.000 -- i.MX 93
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.14.1.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.14.1.bb
deleted file mode 100644
index 0107d90e6..000000000
--- a/recipes-fsl/mcore-demos/imx-m33-demos_2.14.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2023 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=db4762b09b6bda63da103963e6e081de"
-SRC_URI[imx8ulp.md5sum] = "6a1d2b904255ad2b514a234e6282209f"
-SRC_URI[imx8ulp.sha256sum] = "eb8710c31dd58e23ed50653a1b90106e78776a1062abea2a16139cf371828a5a"
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.15.000.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.15.000.bb
deleted file mode 100644
index 542ff168a..000000000
--- a/recipes-fsl/mcore-demos/imx-m33-demos_2.15.000.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2023 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=44a8052c384584ba09077e85a3d1654f"
-SRC_URI[imx93.md5sum] = "2fad663ff63d273a2cb775e06db9eedc"
-SRC_URI[imx93.sha256sum] = "257066cbd57add127fae15da72f12f1cf6a847ff300e7b4ac63f507693898dfa"
-COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
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
new file mode 100644
index 000000000..e1d303e3d
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb
@@ -0,0 +1,13 @@
+# 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-m4-demos_1.0.1.bb b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
index fd99c6370..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
@@ -1,28 +1,13 @@
-SUMMARY = "i.MX M4 core Demo images"
+# Copyright 2017-2021 NXP
-SECTION = "app"
+# Released under the MIT license (see COPYING.MIT for the terms)
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM:mx7d-nxp-bsp = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
-inherit deploy fsl-eula-unpack
+require imx-mcore-demos.inc
-M4_SOC ?= "INVALID"
+LIC_FILES_CHKSUM:mx7d-nxp-bsp = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
-M4_SOC:mx7d-nxp-bsp = "imx7d-sabresd"
-SRC_URI = "${FSL_MIRROR}/${M4_SOC}-m4-freertos-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${SOC}-m4-freertos-${PV}.bin;fsl-eula=true"
-S = "${WORKDIR}/${M4_SOC}-m4-freertos-${PV}"
+S = "${UNPACKDIR}/${SOC}-m4-freertos-${PV}"
-SRC_URI[md5sum] = "b05b780ff3916f4953ab58ac95233c38"
 SRC_URI[sha256sum] = "cc00d3b936d49b2794a2a99e10129437e70caba3fd26b8379b8c50dd22f73254"
-do_deploy () {
-   # Install the demo binaries
-   install -d ${DEPLOYDIR}
-   cp ${S}/*.bin ${DEPLOYDIR}/
-   ls ${DEPLOYDIR}/
-}
-addtask deploy before do_build after do_compile
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx7d-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.0.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.14.0.bb
deleted file mode 100644
index b2076cca6..000000000
--- a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2017-2023 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-require imx-mcore-demos.inc
-LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=9135422c7a38dac21bf1f858b6ef3bac"
-LIC_FILES_CHKSUM:mx7ulp-nxp-bsp = "file://COPYING;md5=9135422c7a38dac21bf1f858b6ef3bac"
-SRC_URI[imx8mq.md5sum] = "0235860aca583e50af88b141e8f25d13"
-SRC_URI[imx8mq.sha256sum] = "decb52b246800e3fa926704207a0ac9a960723da8502887a31f353aaa370c9d9"
-SRC_URI[imx7ulp.md5sum] = "4ec757b7a2a2bdf33f583c328a4631f1"
-SRC_URI[imx7ulp.sha256sum] = "51715bee5e300ee6160c92979e7075e3aa7f7114e7742699bfaa9779113a6fe9"
-COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mq-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.1.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.14.1.bb
deleted file mode 100644
index 67fadb2f6..000000000
--- a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2017-2023 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=db4762b09b6bda63da103963e6e081de"
-SRC_URI[imx8mm.md5sum] = "8db99da9efe8a5409a246c8a63d418dc"
-SRC_URI[imx8mm.sha256sum] = "8269d7461efcdba0b8c3e684df8b45c2d8ace3fdf426b81bdfb46855a1577987"
-COMPATIBLE_MACHINE = "(mx8mm-nxp-bsp)"
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
new file mode 100644
index 000000000..813b3025d
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb
@@ -0,0 +1,16 @@
+# Copyright 2017-2024 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+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"
+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_2.9.0.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
index 63c402dda..0c2fe9a17 100644
--- a/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
@@ -6,14 +6,12 @@ require imx-mcore-demos.inc
 LIC_FILES_CHKSUM:mx8dxl-nxp-bsp = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
 LIC_FILES_CHKSUM:mx8qm-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a"
 LIC_FILES_CHKSUM:mx8qxp-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a"
+LIC_FILES_CHKSUM:mx8dx-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a"
-SRC_URI[imx8dxl.md5sum] = "8850c04a8af91e2bd822cecd5ec56e12"
 SRC_URI[imx8dxl.sha256sum] = "66ddba970712ed394de4034b362334a12caa5865a6afc1dfb5a897bb55b4fcf1"
-SRC_URI[imx8qm.md5sum] = "5912ca94847ee56a7e8b866b211b67d9"
 SRC_URI[imx8qm.sha256sum] = "c695e72b0c7f609132f5990469cf950c03e137de887bd7e24d059c51a7b499be"
-SRC_URI[imx8qx.md5sum] = "5bc15014f59b2b11c71299fac608be5d"
 SRC_URI[imx8qx.sha256sum] = "bbb268a30a58a86e38966122191c8aa69f427c6c1d56b0ce81e518f4d652782a"
 COMPATIBLE_MACHINE = "(mx8dxl-nxp-bsp|mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.0.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.14.0.bb
deleted file mode 100644
index 7849ccca2..000000000
--- a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2023 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=9135422c7a38dac21bf1f858b6ef3bac"
-LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=9135422c7a38dac21bf1f858b6ef3bac"
-SRC_URI[imx8mn.md5sum] = "5ba15434b72f1eb7315e6ddb8a66a0f9"
-SRC_URI[imx8mn.sha256sum] = "8fe6c76da7eb0bbebb8e18a308249ca78a1c5c1d58034cf0fd3c5028aa5740e2"
-SRC_URI[imx8mnddr3l.md5sum] = "62115bc3415eac0f9a4249ed9bb94f98"
-SRC_URI[imx8mnddr3l.sha256sum] = "4b405e1ae439f651c21c4d4bd88f89695974a15aabb89cba65daa2f9922b273d"
-COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.1.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.14.1.bb
deleted file mode 100644
index ddd996619..000000000
--- a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2023 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-require imx-mcore-demos.inc
-LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
-LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
-SRC_URI[imx8mp.md5sum] = "f12cd36cd48cfc65ada700445f8cecaf"
-SRC_URI[imx8mp.sha256sum] = "f2da9e7d7ea6d7b5f33eb12d20e6c5c07fe3110d362f5263d672729f2cd73b37"
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp|mx8mpul-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.15.000.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.15.000.bb
deleted file mode 100644
index 077942054..000000000
--- a/recipes-fsl/mcore-demos/imx-m7-demos_2.15.000.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2023 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=44a8052c384584ba09077e85a3d1654f"
-SRC_URI[imx95.md5sum] = "572b54c7255faa020612261462bdd96b"
-SRC_URI[imx95.sha256sum] = "118ea2248d7fd8a48412855fc19ff6f37f4e09e6d387dfdd458bb9a19d6192c6"
-COMPATIBLE_MACHINE = "(mx95-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
new file mode 100644
index 000000000..387d6527a
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb
@@ -0,0 +1,22 @@
+# 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
new file mode 100644
index 000000000..17d90903a
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_24.12.00.bb
@@ -0,0 +1,10 @@
+# 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-mcore-demos.inc b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
index 32afc3123..9b9553fcc 100644
--- a/recipes-fsl/mcore-demos/imx-mcore-demos.inc
+++ b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
@@ -9,6 +9,7 @@ inherit deploy fsl-eula-unpack
 SOC                ?= "INVALID"
 SOC:mx7ulp-nxp-bsp  = "imx7ulp"
+SOC:mx7d-nxp-bsp    = "imx7d-sabresd"
 SOC:mx8dxl-nxp-bsp  = "imx8dxl"
 SOC:mx8mm-nxp-bsp   = "imx8mm"
 SOC:mx8mn-nxp-bsp   = "imx8mn"
@@ -34,24 +35,25 @@ 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}"
-#SRC_URI="https://www.nxp.com/lgfiles/NMG/MAD/YOCTO//imx93-m33-demo-2.14.0.bin;fsl-eula=true;name=imx93"
 SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt"
+MCORE_DEMO_FILE_EXTENSION               ?= "bin"
+MCORE_DEMO_FILE_EXTENSION:mx7ulp-nxp-bsp = "img"
 do_install () {
    install -d ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 ${S}/*.elf ${D}${nonarch_base_libdir}/firmware
+    if ls ${S}/*.elf > /dev/null 2>&1; then
+        install -m 0644 ${S}/*.elf ${D}${nonarch_base_libdir}/firmware
+    fi
+    install -m 0644 ${S}/*.${MCORE_DEMO_FILE_EXTENSION} ${D}${nonarch_base_libdir}/firmware
 }
-DEPLOY_FILE_EXT       ?= "bin"
-DEPLOY_FILE_EXT:mx7ulp-nxp-bsp = "img"
 do_deploy () {
-   # Install the demo binaries
+    # Install the demo binaries
-   install -m 0644 ${S}/*.${DEPLOY_FILE_EXT} ${DEPLOYDIR}/
+    install -d ${DEPLOYDIR}/mcore-demos
+    install -m 0644 ${S}/*.${MCORE_DEMO_FILE_EXTENSION} ${DEPLOYDIR}/mcore-demos/
 }
 addtask deploy after do_install
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
index 415587a82..09eac053b 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
@@ -8,7 +8,6 @@ ISP_PKGS      ?= ""
 ISP_PKGS:mx8mp-nxp-bsp = " \
    isp-imx \
    basler-camera \
-    basler-camera-dev \
    kernel-module-isp-vvcam \
 "
 RDEPENDS:${PN} = " \
diff --git a/recipes-graphics/drm/libdrm_2.4.116.imx.bb b/recipes-graphics/drm/libdrm_2.4.123.imx.bb
index ff23f35f3..e4208cff3 100644
--- a/recipes-graphics/drm/libdrm_2.4.116.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.123.imx.bb
@@ -13,10 +13,8 @@ DEPENDS = "libpthread-stubs"
 SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
 IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https"
-SRCBRANCH = "libdrm-imx-2.4.116"
+SRCBRANCH = "libdrm-imx-2.4.123"
-SRCREV = "2f1797674f94572ae8c365c8cbffb0263337ed57"
+SRCREV = "c7c4953161a0f8f2cc7bee70284bf3263c9cfcf5"
-S = "${WORKDIR}/git"
 DEFAULT_PREFERENCE = "-1"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb
index b10cd997a..bf0a127c9 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb
@@ -4,28 +4,26 @@
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" 
 DEPENDS = "libdrm ${LIBGAL_IMX}"
-LIBGAL_IMX              = "libgal-imx"
+LIBGAL_IMX        = ""
-LIBGAL_IMX:mx95-nxp-bsp = ""
+LIBGAL_IMX:imxviv = "libgal-imx"
 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 = "ee47ef7"
+IMX_SRCREV_ABBREV = "8d2a88d"
 IMX_SRC_URI_NAME = "v1"
-SRC_URI[v1.md5sum] = "4150f09e27178101fdccb792b7cbc526"
+SRC_URI[v1.sha256sum] = "20325a7c6090b79e012339aed25fa4c3b760efcc32be339e389a36a15e44bdfc"
-SRC_URI[v1.sha256sum] = "bd7849376564f7e2eb55210f156afae00b49451de6de80cfbc5fbda15be6a2b0"
-IMX_SRCREV_ABBREV:mx95-nxp-bsp = "ee47ef7"
+IMX_SRCREV_ABBREV:imxmali = "8d2a88d"
-IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
+IMX_SRC_URI_NAME:imxmali = "v2"
-SRC_URI[v2.md5sum] = "031396e175c432eb6c84aad8e0a6fc7d"
+SRC_URI[v2.sha256sum] = "eb7108256cb55d996c07f6941d0d4a76beaf73458494b2c902d907bc8228eeeb"
-SRC_URI[v2.sha256sum] = "0646d8cc8e53f22fc15a61f0b78cd5f73460520f91949bc1d29c10ecbf77307b"
-S = "${WORKDIR}/${IMX_BIN_NAME}"
+S = "${UNPACKDIR}/${IMX_BIN_NAME}"
 inherit fsl-eula-unpack
@@ -36,10 +34,14 @@ do_install () {
    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
 }
+INSANE_SKIP:append:libc-musl = " file-rdeps"
+RDEPENDS:${PN}:append:libc-musl = " gcompat"
 # The packaged binaries have been stripped of debug info, so disable
 # operations accordingly.
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 55f88da39..1f62398fe 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,14 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 DEPENDS = "cairo"
-PV = "2.1+git${SRCPV}"
+PV = "2.3+git${SRCPV}"
 SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
 GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
-SRCBRANCH = "imx_2.1"
+SRCBRANCH = "imx_2.3"
-SRCREV = "bec2f3839737b0e83b68b1c976373d9a78e5762f"
+SRCREV = "7d12c50c07d73650b4c97906ce917aff429238f8"
-S = "${WORKDIR}/git"
 inherit pkgconfig
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb
index 3ebb8f884..3c8784d0f 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb
@@ -5,19 +5,17 @@
 DESCRIPTION = "G2D library using i.MX GPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" 
 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 = "b07999b"
+IMX_SRCREV_ABBREV = "c600d03"
-SRC_URI[aarch64.md5sum] = "fa30ce75803697d5131d707b300258ee"
+SRC_URI[aarch64.sha256sum] = "e6c336c0b876efab7598a2d7817111772284487f646d5d83c400692f2cdfebe3"
-SRC_URI[aarch64.sha256sum] = "2dff0279ead132ec5fa61dbe9b2b1969135e8ce9fe7487957371327357d70ac7"
+SRC_URI[arm.sha256sum] = "6e1a42f2c570582b8038d1b5c86dbdcd645e75cc10a1db23e716f662d1c1329f"
-SRC_URI[arm.md5sum] = "c81be7c93b60c7d3f3eb5b7bfeda42a4"
-SRC_URI[arm.sha256sum] = "e17ac373193622ec0c9aa490ef1b93551d22a2e88ee9f1098ed984e62f02a06c"
-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 50c37a2c5..9fd170ad5 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,21 +1,19 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3"
 PROVIDES += "virtual/libg2d"
-PV = "2.1.0+git${SRCPV}"
+PV = "2.3+git${SRCPV}"
 SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
 IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
-SRCBRANCH = "imx_2.1"
+SRCBRANCH = "imx_2.3"
-SRCREV = "9f9f41fa0e86757f856e1ec7824f56022fe94586"
+SRCREV = "f3aabbcb7977a0a17c962c62b02bc829855f8edf"
-S = "${WORKDIR}/git"
 inherit use-imx-headers
@@ -25,4 +23,5 @@ do_install() {
    oe_runmake install
 }
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx93-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 7d97f4755..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,28 +9,20 @@ 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_BACKEND:mx6-nxp-bsp = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \
-       bb.utils.contains('DISTRO_FEATURES',     'x11',    'x11', \
-                                                             '', d), d)} \
-"
-PACKAGECONFIG_BACKEND:mx7-nxp-bsp  = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}"
-PACKAGECONFIG_BACKEND:mx8-nxp-bsp  = "waffle"
-PACKAGECONFIG_BACKEND:mx95-nxp-bsp = "waffle"
-PACKAGECONFIG_GPU2D              = ""
-PACKAGECONFIG_GPU2D:imxgpu2d     = "vivante"
-PACKAGECONFIG_GPU2D:mx95-nxp-bsp = ""
 PACKAGECONFIG ??= " \
    egl \
    ${PACKAGECONFIG_BACKEND} \
    ${PACKAGECONFIG_GPU2D} \
 "
+PACKAGECONFIG_BACKEND = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11',    'x11', \
+                                                             '', d), d)} \
+"
+PACKAGECONFIG_GPU2D                 = ""
+PACKAGECONFIG_GPU2D:imxviv:imxgpu2d = "vivante"
 PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl"
 PACKAGECONFIG[gui] = "-DENABLE_GUI=ON,-DENABLE_GUI=OFF"
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 e33df4441..88081cc61 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -31,12 +31,12 @@ PROVIDES += " \
 "
 EXTRA_PROVIDES = " \
    ${PROVIDES_OPENCL} \
-    ${PROVIDES_OPENGLES3} \
    ${PROVIDES_OPENVX} \
 "
 EXTRA_PROVIDES:append:imxgpu3d = " \
    virtual/libgles1 \
    virtual/libgles2 \
+    virtual/libgles3 \
 "
 EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
    virtual/libgbm \
@@ -51,9 +51,6 @@ PROVIDES_OPENCL = " \
 PROVIDES_OPENCL:mx7-nxp-bsp   = ""
 PROVIDES_OPENCL:mx8mm-nxp-bsp = ""
-PROVIDES_OPENGLES3               = ""
-PROVIDES_OPENGLES3:mx8-nxp-bsp   = "virtual/libgles3"
 # Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus.
 # However, only limited support is provided on other i.MX 8 machines
 # as needed for i.MX machine learning packages.
@@ -63,15 +60,20 @@ PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
+RPROVIDES_OPENCL               = "opencl-icd-loader-dev"
+RPROVIDES_OPENCL:mx7-nxp-bsp   = ""
+RPROVIDES_OPENCL:mx8mm-nxp-bsp = ""
+RPROVIDES:${PN}:append:imx-nxp-bsp = " ${RPROVIDES_OPENCL}"
 PE = "1"
 inherit fsl-eula-unpack
 FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:"
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-           file://imx_icd.json"
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 PACKAGECONFIG ?= ""
@@ -181,8 +183,6 @@ IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
 IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
-LIBVULKAN_API_VERSION   = "1.3.239"
 do_install () {
    install -d ${D}${libdir}
    install -d ${D}${includedir}
@@ -250,8 +250,7 @@ do_install () {
        rm -rf ${D}/opt/viv_samples/cl11
    else
        # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
-        install -d ${D}${sysconfdir}/OpenCL/vendors/
+        install -Dm 0644 ${S}/gpu-core/etc/OpenCL/vendors/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
-        install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
        if [ "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}" = "" ]; then
            rm -f ${D}${includedir}/CL/cl_viv_vx_ext.h
@@ -274,9 +273,8 @@ do_install () {
                rm -rf ${D}$f
            done
        else
-            install -Dm 0644 ${WORKDIR}/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
+            install -Dm 0644 ${S}/gpu-core/etc/vulkan/icd.d/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
-            sed -i "s,%libdir%,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
+            sed -i "s,/usr/lib,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
-            sed -i "s,%api_version%,${LIBVULKAN_API_VERSION}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json
        fi
    fi
@@ -332,7 +330,7 @@ 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 = "${includedir}/HAL"
+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"
@@ -393,7 +391,7 @@ FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \
                       ${libdir}/libLLVM_viv${SOLIBS} \
                       ${sysconfdir}/OpenCL/vendors/Vivante.icd"
 FILES:libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
-RDEPENDS:libopencl-imx= "libclc-imx"
+RDEPENDS:libopencl-imx = "libclc-imx"
 FILES:libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}"
 FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/pkgconfig/vg.pc"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json
deleted file mode 100644
index 21d83f945..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "file_format_version": "1.0.0",
-    "ICD": {
-        "library_path": "%libdir%/libvulkan_VSI.so.1",
-        "api_version": "%api_version%"
-    }
-}
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb
deleted file mode 100644
index 2b1724664..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-IMX_SRCREV_ABBREV = "b07999b"
-SRC_URI[md5sum] = "eae60321ac971293d3213c88b9198ca0"
-SRC_URI[sha256sum] = "ef9be89d3dd3b6448c720e061a8b81bdd26f7a5ff70de1786a5feef2e4836474"
-COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb
deleted file mode 100644
index b3c397362..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-IMX_SRCREV_ABBREV = "b07999b"
-SRC_URI[md5sum] = "142d9b9ef6f440b8e307569873bdb6b5"
-SRC_URI[sha256sum] = "ba86656c357c5d9793058695f320e4cf650d4693e84321870bad392f2a622807"
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
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
new file mode 100644
index 000000000..9fbb7e924
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch32.bb
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..aeed17fe8
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch64.bb
@@ -0,0 +1,9 @@
+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/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend
index 3b2655ce7..e8c7ac161 100644
--- a/recipes-graphics/libsdl2/libsdl2_%.bbappend
+++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend
@@ -1,3 +1,6 @@
+PACKAGECONFIG:append:imx-nxp-bsp = " ${PACKAGECONFIG_LIBDECOR}"
+PACKAGECONFIG_LIBDECOR ??= "libdecor"
 # what vivante driver does libsdl2 mean? Anyway it fails with missing functions as
 # VIVANTE_Create VIVANTE_GLES_GetProcAddress VIVANTE_GLES_UnloadLibrary ...
 EXTRA_OECMAKE:append:imxgpu = " -DSDL_VIVANTE=OFF"
diff --git a/recipes-graphics/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
new file mode 100644
index 000000000..e4fafeb0b
--- /dev/null
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -0,0 +1,107 @@
+SUMMARY = "Graphics libraries and driver for i.MX Mali GPU"
+SECTION = "libs"
+DEPENDS = " \
+    libdrm \
+    vulkan-loader \
+    wayland \
+    wayland-protocols"
+PROVIDES = " \
+    virtual/egl \
+    virtual/libgbm \
+    virtual/libgles1 \
+    virtual/libgles2 \
+    virtual/libgles3"
+# The packaged binaries have been stripped of debug info, so disable
+# operations accordingly.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+PACKAGES =+ " \
+    ${PN}-libegl     ${PN}-libegl-dev \
+    ${PN}-libgbm     ${PN}-libgbm-dev \
+    ${PN}-libgles1   ${PN}-libgles1-dev \
+    ${PN}-libgles2   ${PN}-libgles2-dev \
+    ${PN}-libgles3   ${PN}-libgles3-dev \
+    ${PN}-libvulkan  \
+    ${PN}-opencl-icd ${PN}-opencl-icd-dev"
+# Since libmali.so is loaded by dlopen, include it in the main package
+FILES:${PN} += " \
+    ${libdir}/libmali.so \
+    ${nonarch_base_libdir}/firmware"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP:${PN} = "dev-so"
+FILES:${PN}-libegl = " \
+    ${libdir}/libEGL${SOLIBS}"
+FILES:${PN}-libgbm = " \
+    ${libdir}/libgbm${SOLIBS}"
+FILES:${PN}-libgles1 = " \
+    ${libdir}/libGLESv1_CM${SOLIBS}"
+FILES:${PN}-libgles2 = " \
+    ${libdir}/libGLESv2${SOLIBS}"
+FILES:${PN}-opencl-icd = " \
+    ${sysconfdir}/OpenCL"
+FILES:${PN}-libvulkan = " \
+    ${sysconfdir}/vulkan"
+FILES:${PN}-dev = " \
+    ${bindir}/malisc"
+FILES:${PN}-libegl-dev = " \
+    ${includedir}/EGL \
+    ${includedir}/KHR \
+    ${libdir}/libEGL${SOLIBSDEV} \
+    ${libdir}/pkgconfig/egl.pc"
+FILES:${PN}-libgbm-dev = " \
+    ${includedir}/gbm.h \
+    ${libdir}/libgbm${SOLIBSDEV} \
+    ${libdir}/pkgconfig/gbm.pc"
+# Consolidate GLES dev packages
+PACKAGES =+ "${PN}-libgles-dev"
+FILES:${PN}-libgles-dev = " \
+    ${includedir}/GLES* \
+    ${libdir}/libGLES*${SOLIBSDEV} \
+    ${libdir}/pkgconfig/gles*.pc"
+DEBIAN_NOAUTONAME:${PN}-libgles-dev = "1"
+RREPLACES:${PN}-libgles-dev = "libgles-dev"
+RPROVIDES:${PN}-libgles-dev = "libgles-dev"
+RCONFLICTS:${PN}-libgles-dev = "libgles-dev"
+ALLOW_EMPTY:${PN}-libgles1-dev = "1"
+ALLOW_EMPTY:${PN}-libgles2-dev = "1"
+ALLOW_EMPTY:${PN}-libgles3-dev = "1"
+RDEPENDS:${PN}-libgles1-dev = "${PN}-libgles-dev"
+RDEPENDS:${PN}-libgles2-dev = "${PN}-libgles-dev"
+RDEPENDS:${PN}-libgles3-dev = "${PN}-libgles-dev"
+FILES:${PN}-opencl-icd-dev = " \
+    ${bindir}/mali_clcc"
+python __anonymous() {
+    # Avoid Debian-renaming
+    for p in (("libegl",    "libegl1"      ),
+              ("libgbm",    "libgbm1"      ),
+              ("libgles1",  "libglesv1-cm1"),
+              ("libgles2",  "libglesv2-2"  ),
+              ("libgles3",                 )):
+        fullp = "${PN}-" + p[0]
+        pkgs = "".join(' %s' % i for i in p)
+        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
+        d.appendVar("RREPLACES:"  + fullp, pkgs)
+        d.appendVar("RPROVIDES:"  + fullp, pkgs)
+        d.appendVar("RCONFLICTS:" + fullp, pkgs)
+        # libmali.so is loaded with dlopen, so an explicit runtime dependency is necessary
+        d.appendVar("RDEPENDS:"   + fullp, "${PN}")
+        # For -dev, the first element is both the Debian and original name
+        fullp += "-dev"
+        pkgs = p[0] + "-dev"
+        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
+        d.appendVar("RREPLACES:"  + fullp, pkgs)
+        d.appendVar("RPROVIDES:"  + fullp, pkgs)
+        d.appendVar("RCONFLICTS:" + fullp, pkgs)
+}
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
diff --git a/recipes-graphics/mali/mali-imx_r53.0.bb b/recipes-graphics/mali/mali-imx_r53.0.bb
new file mode 100644
index 000000000..74d9d0faf
--- /dev/null
+++ b/recipes-graphics/mali/mali-imx_r53.0.bb
@@ -0,0 +1,25 @@
+require mali-imx.inc
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI[sha256sum] = "67a008bc64af4f3d9ad91465af3c0c3ac90ff8dcbcdaed96036eccc62880c7a3"
+IMX_SRCREV_ABBREV = "f2226b0"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack
+do_install () {
+    install -d ${D}
+    cp -r ${S}/etc ${S}/usr ${D}
+    # Move firmware to nonarch_base_libdir
+    if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then
+        install -d ${D}${nonarch_base_libdir}
+        mv ${D}${base_libdir}/firmware ${D}${nonarch_base_libdir}
+    fi
+}
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-graphics/mesa/mesa-demos/0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch b/recipes-graphics/mesa/mesa-demos/0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch
new file mode 100644
index 000000000..91b736ee7
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-demos/0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch
@@ -0,0 +1,59 @@
+From 400c42cda81a859bd5950567eaffe394053ccc99 Mon Sep 17 00:00:00 2001
+From: Wujian Sun <wujian.sun_1@nxp.com>
+Date: Thu, 5 Dec 2024 10:32:05 +0800
+Subject: [PATCH] YOCIMX-8300 Fix mesa-demos build break on GCC 14
+| ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c: In function 'main':
+| ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c:190:24: error: passing
+argument 1 of 'eglGetDisplay' from incompatible pointer type
+[-Wincompatible-pointer-types]
+|   190 |    dpy = eglGetDisplay(gbm);
+|       |                        ^~~
+|       |                        |
+|       |                        struct gbm_device *
+| In file included from ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c:33:
+Type' {aka 'struct wl_display *'} but argument is of type 'struct
+gbm_device *'
+|   143 | EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay
+(EGLNativeDisplayType display_id);
+|       |
+~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
+| ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c:229:50: error: passing
+argument 3 of 'eglCreateWindowSurface' from incompatible pointer type
+[-Wincompatible-pointer-types]
+|   229 |    surface = eglCreateWindowSurface(dpy, config, gs, NULL);
+|       |                                                  ^~
+|       |                                                  |
+|       |                                                  struct
+gbm_surface *
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/205]
+Signed-off-by: Wujian Sun <wujian.sun_1@nxp.com>
+---
+ src/egl/opengl/eglkms.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/src/egl/opengl/eglkms.c b/src/egl/opengl/eglkms.c
+index 832962b..57adc7b 100644
+--- a/src/egl/opengl/eglkms.c
+++ b/src/egl/opengl/eglkms.c
+@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
+       goto close_fd;
+    }
+ 
+-   dpy = eglGetDisplay(gbm);
+   dpy = eglGetDisplay((EGLNativeDisplayType) gbm);
+    if (dpy == EGL_NO_DISPLAY) {
+       fprintf(stderr, "eglGetDisplay() failed\n");
+       ret = -1;
+@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
+    gs = gbm_surface_create(gbm, kms.mode.hdisplay, kms.mode.vdisplay,
+                           GBM_BO_FORMAT_XRGB8888,
+                           GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+-   surface = eglCreateWindowSurface(dpy, config, gs, NULL);
+   surface = eglCreateWindowSurface(dpy, config, (EGLNativeWindowType) gs, NULL);
+ 
+    if (!eglMakeCurrent(dpy, surface, surface, ctx)) {
+       fprintf(stderr, "failed to make context current\n");
diff --git a/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch b/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch
new file mode 100644
index 000000000..fb9091129
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch
@@ -0,0 +1,27 @@
+From f5a6600ff8312a7c0f30273ab783c1d822749a73 Mon Sep 17 00:00:00 2001
+From: Jiyu Yang <jiyu.yang@nxp.com>
+Date: Thu, 11 Apr 2024 16:30:50 +0800
+Subject: [PATCH] egl: clear backgrounds black
+if 50% translucency used, the application render result can vary
+depending on the format chosen, such as R10G10B10A2 or RGB24.
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/174]
+Signed-off-by: Jiyu Yang <jiyu.yang@nxp.com>
+---
+ src/egl/opengles2/es2gears.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/egl/opengles2/es2gears.c b/src/egl/opengles2/es2gears.c
+index 9501f61..e421a8a 100644
+--- a/src/egl/opengles2/es2gears.c
+++ b/src/egl/opengles2/es2gears.c
+@@ -350,7 +350,7 @@ gears_draw(void)
+    GLfloat transform[16];
+    mat4_identity(transform);
+ 
+-   glClearColor(0.0, 0.0, 0.0, 0.0);
+   glClearColor(0.0, 0.0, 0.0, 1.0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ 
+    /* Translate and rotate the view */
diff --git a/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch b/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch
index 8401793cd..2e87ed155 100644
--- a/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch
+++ b/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch
@@ -1,4 +1,4 @@
-From 757649a766f90e745f24df1d191caeef15c71399 Mon Sep 17 00:00:00 2001
+From e453ac82b6ffd8f1d0de4c8ac8fd4bab6b924958 Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <otavio@ossystems.com.br>
 Date: Tue, 4 Jun 2013 09:28:51 -0300
 Subject: [PATCH] Replace glWindowPos2iARB calls with glWindowPos2i
@@ -34,7 +34,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 20 files changed, 28 insertions(+), 28 deletions(-)
 diff --git a/src/demos/copypix.c b/src/demos/copypix.c
-index 286c5a9..041b567 100644
+index 164d8c0..2d062a7 100644
 --- a/src/demos/copypix.c
 +++ b/src/demos/copypix.c
 @@ -54,7 +54,7 @@ static void Display( void )
@@ -56,7 +56,7 @@ index 286c5a9..041b567 100644
    glPixelZoom(1, 1);
 
 diff --git a/src/demos/engine.c b/src/demos/engine.c
-index 928fcbb..beace4c 100644
+index 410d889..b24638a 100644
 --- a/src/demos/engine.c
 +++ b/src/demos/engine.c
 @@ -971,7 +971,7 @@ Draw(void)
@@ -69,7 +69,7 @@ index 928fcbb..beace4c 100644
       if (lit)
         glEnable(GL_LIGHTING);
 diff --git a/src/demos/fogcoord.c b/src/demos/fogcoord.c
-index 567eec0..e833009 100644
+index ea9a3ae..ed0483f 100644
 --- a/src/demos/fogcoord.c
 +++ b/src/demos/fogcoord.c
 @@ -68,14 +68,14 @@ PrintInfo(void)
@@ -90,7 +90,7 @@ index 567eec0..e833009 100644
 }
 
 diff --git a/src/glsl/shadow_sampler.c b/src/glsl/shadow_sampler.c
-index b830030..eb82d8b 100644
+index 5f0f192..16a2201 100644
 --- a/src/glsl/shadow_sampler.c
 +++ b/src/glsl/shadow_sampler.c
 @@ -85,7 +85,7 @@ Redisplay(void)
@@ -103,7 +103,7 @@ index b830030..eb82d8b 100644
 
    {
 diff --git a/src/tests/auxbuffer.c b/src/tests/auxbuffer.c
-index 5fa399a..0cd5f47 100644
+index d4f7c2d..5ff1785 100644
 --- a/src/tests/auxbuffer.c
 +++ b/src/tests/auxbuffer.c
 @@ -419,7 +419,7 @@ event_loop(Display *dpy, Window win)
@@ -116,7 +116,7 @@ index 5fa399a..0cd5f47 100644
       glCopyPixels(0, 0, WinWidth, WinHeight, GL_COLOR);
       glEnable(GL_DEPTH_TEST);
 diff --git a/src/tests/copypixrate.c b/src/tests/copypixrate.c
-index 2f64e0a..df1f9b0 100644
+index 4c12fbd..e80f3cb 100644
 --- a/src/tests/copypixrate.c
 +++ b/src/tests/copypixrate.c
 @@ -91,7 +91,7 @@ BlitOne(void)
@@ -129,7 +129,7 @@ index 2f64e0a..df1f9b0 100644
    }
 }
 diff --git a/src/tests/drawbuffers.c b/src/tests/drawbuffers.c
-index fa2f8a7..cd5033f 100644
+index f017d25..36b241f 100644
 --- a/src/tests/drawbuffers.c
 +++ b/src/tests/drawbuffers.c
 @@ -88,7 +88,7 @@ Display(void)
@@ -142,7 +142,7 @@ index fa2f8a7..cd5033f 100644
 
    free(buffer);
 diff --git a/src/tests/drawbuffers2.c b/src/tests/drawbuffers2.c
-index 5bcf0b2..84d444b 100644
+index 0cb8d47..ac1a5aa 100644
 --- a/src/tests/drawbuffers2.c
 +++ b/src/tests/drawbuffers2.c
 @@ -112,7 +112,7 @@ Display(void)
@@ -155,7 +155,7 @@ index 5bcf0b2..84d444b 100644
 
    free(buffer);
 diff --git a/src/tests/fbotest1.c b/src/tests/fbotest1.c
-index 161903c..5930a6d 100644
+index 322ea30..19082b6 100644
 --- a/src/tests/fbotest1.c
 +++ b/src/tests/fbotest1.c
 @@ -61,7 +61,7 @@ Display( void )
@@ -168,7 +168,7 @@ index 161903c..5930a6d 100644
 
    free(buffer);
 diff --git a/src/tests/fbotest2.c b/src/tests/fbotest2.c
-index 6ef7f12..11c867e 100644
+index 05554e4..e6a6c29 100644
 --- a/src/tests/fbotest2.c
 +++ b/src/tests/fbotest2.c
 @@ -72,7 +72,7 @@ Display( void )
@@ -190,7 +190,7 @@ index 6ef7f12..11c867e 100644
 
       free(buffer);
 diff --git a/src/tests/fbotest3.c b/src/tests/fbotest3.c
-index 19f684d..e6d7710 100644
+index a3ac340..c320794 100644
 --- a/src/tests/fbotest3.c
 +++ b/src/tests/fbotest3.c
 @@ -79,7 +79,7 @@ Display( void )
@@ -203,7 +203,7 @@ index 19f684d..e6d7710 100644
 
    free(buffer);
 diff --git a/src/tests/readrate.c b/src/tests/readrate.c
-index 3859cf4..81eb8a3 100644
+index 8a9a02f..9709835 100644
 --- a/src/tests/readrate.c
 +++ b/src/tests/readrate.c
 @@ -85,7 +85,7 @@ MeasureFormat(struct format_type *fmt, GLint width, GLint height, GLuint pbo)
@@ -242,7 +242,7 @@ index 3859cf4..81eb8a3 100644
    }
 
 diff --git a/src/tests/viewmemory.c b/src/tests/viewmemory.c
-index 16044b9..3584c33 100644
+index 16054b6..ff7b4eb 100644
 --- a/src/tests/viewmemory.c
 +++ b/src/tests/viewmemory.c
 @@ -95,7 +95,7 @@ Draw(void)
@@ -255,7 +255,7 @@ index 16044b9..3584c33 100644
 
    glutSwapBuffers();
 diff --git a/src/trivial/clear-fbo-scissor.c b/src/trivial/clear-fbo-scissor.c
-index a30935c..5c15200 100644
+index 2d1ee4f..6d06330 100644
 --- a/src/trivial/clear-fbo-scissor.c
 +++ b/src/trivial/clear-fbo-scissor.c
 @@ -182,7 +182,7 @@ Draw(void)
@@ -268,7 +268,7 @@ index a30935c..5c15200 100644
 
       free(buffer);
 diff --git a/src/trivial/clear-fbo-tex.c b/src/trivial/clear-fbo-tex.c
-index de84f98..f0fbdf6 100644
+index 94534bd..6a38c4b 100644
 --- a/src/trivial/clear-fbo-tex.c
 +++ b/src/trivial/clear-fbo-tex.c
 @@ -140,7 +140,7 @@ static void Draw( void )
@@ -281,7 +281,7 @@ index de84f98..f0fbdf6 100644
       
       free(buffer);
 diff --git a/src/trivial/clear-fbo.c b/src/trivial/clear-fbo.c
-index 10d830b..3fee3e3 100644
+index 2065836..ad39401 100644
 --- a/src/trivial/clear-fbo.c
 +++ b/src/trivial/clear-fbo.c
 @@ -116,7 +116,7 @@ Draw(void)
@@ -294,7 +294,7 @@ index 10d830b..3fee3e3 100644
       
       free(buffer);
 diff --git a/src/trivial/readpixels.c b/src/trivial/readpixels.c
-index ccce4ed..74e0546 100644
+index fb88570..da9030e 100644
 --- a/src/trivial/readpixels.c
 +++ b/src/trivial/readpixels.c
 @@ -71,7 +71,7 @@ static void Draw(void)
@@ -307,7 +307,7 @@ index ccce4ed..74e0546 100644
    glDrawPixels(Width, Height, GL_RGBA, GL_FLOAT, image);
    free(image);
 diff --git a/src/trivial/tri-fbo.c b/src/trivial/tri-fbo.c
-index d5800b2..dd1f21a 100644
+index 76985a9..21c0ec0 100644
 --- a/src/trivial/tri-fbo.c
 +++ b/src/trivial/tri-fbo.c
 @@ -119,7 +119,7 @@ static void Draw( void )
@@ -320,7 +320,7 @@ index d5800b2..dd1f21a 100644
       
       
 diff --git a/src/xdemos/glxsnoop.c b/src/xdemos/glxsnoop.c
-index 2215cfd..13d2b2d 100644
+index 294297a..abb32a8 100644
 --- a/src/xdemos/glxsnoop.c
 +++ b/src/xdemos/glxsnoop.c
 @@ -91,7 +91,7 @@ redraw(Display *dpy, Window srcWin, Window dstWin )
@@ -350,6 +350,3 @@ index f670983..d010085 100644
       glCopyPixels(0, 0, Width[0], Height[0], GL_COLOR);
    }
 
-- 
-1.8.1
diff --git a/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch b/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch
index 459a6ebd4..17fb208c9 100644
--- a/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch
+++ b/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch
@@ -1,10 +1,18 @@
-mesa-demos:  Add extension header to fix build break now that gl1 is removed
+From d152655a1421f0cdf7ce22c35a36c367c07af587 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 26 Aug 2014 14:44:17 -0500
+Subject: [PATCH] mesa-demos:  Add extension header to fix build break now that
+ gl1 is removed
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/egl/opengles1/clear.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/egl/opengles1/clear.c b/src/egl/opengles1/clear.c
-index 9fe1b5291e1905fd6fe572063ed707d59ce45a81..ca9954a21b5f475709dbdef07f90b900962fcbc7 100644
+index 9fe1b52..ca9954a 100644
 --- a/src/egl/opengles1/clear.c
 +++ b/src/egl/opengles1/clear.c
 @@ -34,7 +34,7 @@
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index ff5d71ae1..7d3e7ca1c 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -2,7 +2,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI:append:imxgpu = " \
    file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \
-    file://fix-clear-build-break.patch"
+    file://fix-clear-build-break.patch \
+    file://0001-egl-clear-backgrounds-black.patch \
+    file://0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch \
+"
 REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11"
diff --git a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
index 87d05365c..23af68280 100644
--- a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
+++ b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
@@ -9,6 +9,8 @@ SRC_URI = "\
    file://mesa-etnaviv.sh \
 "
+S = "${UNPACKDIR}"
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
@@ -17,13 +19,13 @@ do_install:use-mainline-bsp() {
    # systemd
    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -D -m 644 ${WORKDIR}/mesa-etnaviv.conf \
+        install -D -m 644 ${UNPACKDIR}/mesa-etnaviv.conf \
            ${D}${sysconfdir}/systemd/system.conf.d/mesa-etnaviv.conf
    fi
    # sysvinit
    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-        install -D -m 644 ${WORKDIR}/mesa-etnaviv.sh \
+        install -D -m 644 ${UNPACKDIR}/mesa-etnaviv.sh \
            ${D}${sysconfdir}/profile.d/mesa-etnaviv.sh
    fi
 }
diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl.bbappend
index 6545571fa..6545571fa 100644
--- a/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/recipes-graphics/mesa/mesa-gl.bbappend
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa.bbappend
index acddfbc66..120561d19 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa.bbappend
@@ -1,6 +1,10 @@
 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"
@@ -15,7 +19,7 @@ python () {
 }
 # Enable Etnaviv and Freedreno support
-PACKAGECONFIG:append:use-mainline-bsp = " gallium etnaviv kmsro freedreno"
+PACKAGECONFIG:append:use-mainline-bsp = " gallium etnaviv freedreno"
 # For NXP BSP, GPU drivers don't support dri
 PACKAGECONFIG:remove:imxgpu:use-nxp-bsp = "dri"
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
new file mode 100644
index 000000000..3dc8db099
--- /dev/null
+++ b/recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 000000000..0cdcbfca6
--- /dev/null
+++ b/recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch
@@ -0,0 +1,33 @@
+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/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
new file mode 100644
index 000000000..da738aabe
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -0,0 +1,52 @@
+From 3448c245b15928aa5a5a3695d9271fb201eb2e3b Mon Sep 17 00:00:00 2001
+From: Yuan Tian <yuan.tian@nxp.com>
+Date: Sat, 27 Apr 2024 06:06:54 +0800
+Subject: [PATCH] LF-11869 change mali wsi layer activating order
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
+---
+ loader/loader.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+diff --git a/loader/loader.c b/loader/loader.c
+index e646b28b4..55912c178 100644
+--- a/loader/loader.c
+++ b/loader/loader.c
+@@ -2906,6 +2906,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+ #if !defined(_WIN32)
+     char temp_path[2048];
+ #endif
+    bool has_wsi_layer = false;
+ 
+     // Now, parse the paths
+     next_file = search_path;
+@@ -2965,6 +2966,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                 name = full_path;
+ 
+                 VkResult local_res;
+                if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) {
+                    has_wsi_layer = true;
+                    continue;
+                }
+                 local_res = add_if_manifest_file(inst, name, out_files);
+ 
+                 // Incomplete means this was not a valid data file.
+@@ -2975,6 +2980,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                     break;
+                 }
+             }
+
+            if(has_wsi_layer) {
+                name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json";
+                vk_result = add_if_manifest_file(inst, name, out_files);
+                has_wsi_layer = false;
+            }
+
+             loader_closedir(inst, dir_stream);
+             if (vk_result != VK_SUCCESS) {
+                 goto out;
+-- 
+2.34.1
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
deleted file mode 100644
index c1a9902b7..000000000
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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}:imxvulkan = "libvulkan-imx"
-# Override default mesa drivers with i.MX GPU drivers
-RRECOMMENDS:${PN}:mx95-nxp-bsp = "mali-imx-libvulkan"
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
new file mode 100644
index 000000000..f46249215
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}:"
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
+"
+# libvulkan.so is loaded dynamically, so put it in the main package
+SOLIBS          = ".so*"
+FILES_SOLIBSDEV = ""
+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/wayland/wayland-protocols_1.32.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb
index 6b2a70917..f360706be 100644
--- a/recipes-graphics/wayland/wayland-protocols_1.32.imx.bb
+++ b/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb
@@ -9,10 +9,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \
                    file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
-SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}"
+SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}"
-SRCREV = "7ece577d467f8afb2f5a2f7fff3761a1e0ee9dad"
+WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https"
+SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}"
-S = "${WORKDIR}/git"
+SRCREV = "831a5389062e56dcb1aac4a5419e55e3002aafaf"
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 9d04df23a..27a5b947b 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -58,8 +58,11 @@ PACKAGECONFIG[use-g2d] = ",,"
 PACKAGECONFIG[xwayland] = ",,"
 do_install:append() {
-    if [ -f "${WORKDIR}/weston.config" ]; then
+    # Replace the template variables
-        install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
+    sed -i -e 's,@bindir@,${bindir},g' ${D}${sysconfdir}/xdg/weston/weston.ini
+    if [ -f "${UNPACKDIR}/weston.config" ]; then
+        install -Dm0755 ${UNPACKDIR}/weston.config ${D}${sysconfdir}/default/weston
    fi
    if [ "${@bb.utils.contains('PACKAGECONFIG', 'gbm-format', 'yes', 'no', d)}" = "yes" ]; then
@@ -88,6 +91,4 @@ do_install:append() {
    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "no" ]; then
        sed -i -e "s/^xwayland=true/#xwayland=true/g" ${D}${sysconfdir}/xdg/weston/weston.ini
    fi
-    sed -i -e 's,@bindir@,${bindir},g' ${D}${sysconfdir}/xdg/weston/weston.ini
 }
diff --git a/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch b/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch
new file mode 100644
index 000000000..3f0b8ee07
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch
@@ -0,0 +1,45 @@
+From 2a7c1797dd65467b7a0be63aa598307b92fb83b5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 14 Dec 2023 09:13:54 -0800
+Subject: [PATCH] libweston,tools: Include libgen.h for basename signature
+Latest musl has removed the declaration from string.h [1] as it only
+implements POSIX version alone and string.h in glibc implements GNU
+version of basename. This now results in compile errors on musl.
+This might be a warning with older compilers but it is error with
+Clang-17+ as it treats -Wimplicit-function-declaration as error
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1420]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libweston/backend-drm/libbacklight.c | 1 +
+ tools/zunitc/src/zunitc_impl.c       | 1 +
+ 2 files changed, 2 insertions(+)
+diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c
+index ca7f2d68..74690fa7 100644
+--- a/libweston/backend-drm/libbacklight.c
+++ b/libweston/backend-drm/libbacklight.c
+@@ -41,6 +41,7 @@
+ #include <drm.h>
+ #include <fcntl.h>
+ #include <malloc.h>
+#include <libgen.h>
+ #include <string.h>
+ #include <errno.h>
+ 
+diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c
+index 18f03015..9b460fa0 100644
+--- a/tools/zunitc/src/zunitc_impl.c
+++ b/tools/zunitc/src/zunitc_impl.c
+@@ -27,6 +27,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
+#include <libgen.h>
+ #include <stdarg.h>
+ #include <stdbool.h>
+ #include <stdio.h>
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index 99624887f..a8440cf23 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -109,18 +109,18 @@ do_install:append() {
        # If X11, ship a desktop file to launch it
        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
                install -d ${D}${datadir}/applications
-                install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
                install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
        fi
        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
        fi
        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
        fi
        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
@@ -165,8 +165,7 @@ SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch
 SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \
            file://0001-g2d-renderer.c-Include-sys-stat.h.patch"
 SRCBRANCH = "weston-imx-10.0.5"
-SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4"
+SRCREV = "7129417ae04de57f9596ccf27f74ef967660a64f"
-S = "${WORKDIR}/git"
 # Disable OpenGL for parts with GPU support for 2D but not 3D
 REQUIRED_DISTRO_FEATURES          = "opengl"
diff --git a/recipes-graphics/wayland/weston_12.0.3.imx.bb b/recipes-graphics/wayland/weston_14.0.1.imx.bb
index 8114ddbbf..96bde0fe0 100644
--- a/recipes-graphics/wayland/weston_12.0.3.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.1.imx.bb
@@ -3,7 +3,7 @@
 # recipe. The second section customizes the recipe for i.MX.
 ########### OE-core copy ##################
-# Upstream hash: 92a460b55e7290ec0006365219189761f7226f7c
+# Upstream hash: 23271a1f908a223b4eb56d6034cbb1ac23da14fe
 SUMMARY = "Weston, a Wayland compositor"
 DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
@@ -14,16 +14,17 @@ 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] = "eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a"
+SRC_URI[sha256sum] = "27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093"
-UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
+UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
-UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
+UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
 inherit meson pkgconfig useradd
@@ -44,7 +45,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayla
                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
                   ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
                   ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
-                   launcher-libseat \
                   image-jpeg \
                   screenshare \
                   shell-desktop \
@@ -60,7 +60,7 @@ SIMPLECLIENTS ?= "all"
 # Compositor choices
 #
 # Weston on KMS
-PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
+PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev seatd virtual/egl virtual/libgles2 virtual/libgbm mtdev"
 # Weston on Wayland (nested Weston)
 PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
 # Weston on X11
@@ -68,7 +68,7 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx
 # Headless Weston
 PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
 # Weston on RDP
-PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
+PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
 # VA-API desktop recorder
 PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva"
 # Weston with EGL support
@@ -99,10 +99,6 @@ PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false"
 PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false"
 # JPEG image loading support
 PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
-# support libseat based launch
-PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd"
-# deprecated and superseded by libseat launcher
-PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false,"
 # screencasting via PipeWire
 PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire"
 # VNC remote screensharing
@@ -116,18 +112,18 @@ do_install:append() {
        # If X11, ship a desktop file to launch it
        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
                install -d ${D}${datadir}/applications
-                install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
                install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
        fi
        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
        fi
        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
        fi
        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
@@ -166,12 +162,15 @@ 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 = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} "
+SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
-SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
+WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
-SRCBRANCH = "weston-imx-12.0.3"
+SRCBRANCH = "weston-imx-14.0.1"
-SRCREV = "b0d890915ee191ceb10e79ea9a830281f5c6258f"
+SRCREV = "0fd5d3ab75346e525b565039a7b8bf5d9008be78"
-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}"
@@ -181,6 +180,9 @@ PACKAGECONFIG_G2D              ??= ""
 PACKAGECONFIG_G2D:imxgpu2d     ??= "imxg2d"
 PACKAGECONFIG_G2D:mx93-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_23.1.1.imx.bb b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
index a9705a233..1d7ee80f6 100644
--- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bb
+++ b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
@@ -1,6 +1,6 @@
 # This recipe copy helps keep meta-freescale master branch compatible
-# with Yocto langdale.
+# with Yocto walnascar.
-# (From OE-Core rev: 35fdbd0ea81650a0421d50fb53989d96c5956331)
+# (From OE-Core rev: 737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7)
 SUMMARY = "XWayland is an X Server that runs under Wayland."
 DESCRIPTION = "XWayland is an X Server running as a Wayland client, \
@@ -16,22 +16,23 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
 SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz"
-BP_ORIGINAL = "${BPN}-23.1.1"
+BP_ORIGINAL = "${BPN}-24.1.6"
-SRC_URI[sha256sum] = "fb9461f5cb9fea5e07e91882311b0c88b43e8843b017ebac05eb5af69aa34c15"
+SRC_URI[sha256sum] = "737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7"
-S = "${WORKDIR}/${BP_ORIGINAL}"
+S = "${UNPACKDIR}/${BP_ORIGINAL}"
 UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
 inherit meson features_check pkgconfig
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt"
+DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt libtirpc"
 OPENGL_PKGCONFIGS = "glx glamor dri3"
-PACKAGECONFIG ??= "${XORG_CRYPTO} \
+PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
 "
 PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence"
+PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor"
 PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11"
 PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl"
 PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
@@ -42,6 +43,10 @@ XORG_CRYPTO ??= "openssl"
 PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl"
 PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle"
 PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt"
+XWAYLAND_EI ??= "xwayland_ei_false"
+PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false"
+PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei"
+PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei"
 do_install:append() {
    # remove files not needed and clashing with xserver-xorg
@@ -51,3 +56,7 @@ do_install:append() {
 FILES:${PN} += "${libdir}/xorg/protocol.txt"
 RDEPENDS:${PN} += "xkbcomp"
+CVE_STATUS_GROUPS = "CVE_STATUS_REDHAT"
+CVE_STATUS_REDHAT = "CVE-2025-26594 CVE-2025-26595 CVE-2025-26596 CVE-2025-26597 CVE-2025-26598 CVE-2025-26599 CVE-2025-26600 CVE-2025-26601"
+CVE_STATUS_REDHAT[status] = "fixed-version: these are tracked as versionless redhat CVEs in NVD DB, fixed in 24.1.6"
diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend
index f71ba16c3..d8f5bdde5 100644
--- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend
+++ b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend
@@ -6,10 +6,8 @@ SRC_URI:append:imxgpu = " \
 OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}"
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU             = ""
-OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx"
+OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx"
-OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx"
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx"
-OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx9-nxp-bsp = "glamor glx"
 # links with imx-gpu libs which are pre-built for glibc
 # gcompat will address it during runtime
@@ -17,4 +15,4 @@ LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
 RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat"
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}"
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 1059e0061..947a31280 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -9,11 +9,9 @@ SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \
 "
 DEPENDS = "iproute2"
-S = "${WORKDIR}/git"
+export IPROUTE2_DIR = "${STAGING_DIR_TARGET}"
-export IPROUTE2_DIR="${STAGING_DIR_TARGET}"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
-export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
+export CROSS_COMPILE = "${WRAP_TARGET_PREFIX}"
 LDFLAGS += "${TOOLCHAIN_OPTIONS}"
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.p2.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
index e48d72585..f55ca7084 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
@@ -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 = "${KERNEL_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}"
-SRCBRANCH = "lf-6.6.y"
+SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.6.3-1.0.0"
+LOCALVERSION = "-6.12.3-1.0.0"
-SRCREV = "3571388e9660f96b65b5fdcc093cc973ee502949"
+SRCREV = "d8c9f00d41b313a1ac122530524a62604c6871c9"
-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.24.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb
deleted file mode 100644
index d2c63aa05..000000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2020-2023 NXP
-DESCRIPTION = "Kernel loadable module for ISP"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
-SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
-ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "2102360b58d9d1b36bc0c654c8301e4014b33951"
-S = "${WORKDIR}/git/vvcam/v4l2"
-inherit module
-DEBUG_PREFIX_MAP:prepend = " \
-    -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
-    -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb
new file mode 100644
index 000000000..62dd737cb
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb
@@ -0,0 +1,22 @@
+# Copyright (C) 2020-2023 NXP
+DESCRIPTION = "Kernel loadable module for ISP"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
+SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
+ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
+SRCBRANCH = "lf-6.12.y_1.0.0"
+SRCREV = "78d717bb22819df9d988ef1b4e3cca1acf61095d"
+S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
+inherit module
+MODULES_MODULE_SYMVERS_LOCATION = "dwe"
+DEBUG_PREFIX_MAP:prepend = " \
+    -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+    -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-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/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
new file mode 100644
index 000000000..72e75fd57
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
@@ -0,0 +1,33 @@
+From f6079560bd0010a7f34bd18fec8fab4df65b22ea Mon Sep 17 00:00:00 2001
+From: Vitor Soares <vitor.soares@toradex.com>
+Date: Wed, 30 Apr 2025 15:12:06 +0100
+Subject: [PATCH] mlinux: moal_main: lower PRINTM_MMSG() log level to KERN_INFO
+Currently, the PRINTM_MMSG macro uses KERN_ALERT for printing messages.
+KERN_ALERT is intended for critical conditions requiring immediate
+attention (e.g., hardware failure), and using it for normal debug output
+is misleading and can clutter system logs.
+This patch lowers the log level to KERN_INFO, which is more appropriate
+for informational messages that are not indicative of system-critical
+failures.
+Upstream-Status: Inappropriate [upstream not accepting patches]
+Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
+---
+ mlinux/moal_main.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/mlinux/moal_main.h b/mlinux/moal_main.h
+index 4328652..27121e0 100644
+--- a/mlinux/moal_main.h
+++ b/mlinux/moal_main.h
+@@ -3529,7 +3529,7 @@ extern t_u32 drvdbg;
+        do {                                                                   \
+                woal_print(MMSG, msg);                                         \
+                if (drvdbg & MMSG)                                             \
+-                       printk(KERN_ALERT msg);                                \
+                       printk(KERN_INFO msg);                                \
+        } while (0)
+ 
+ static inline void woal_print(t_u32 level, char *fmt, ...)
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 48e9cc3bc..70386dc0d 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -1,6 +1,6 @@
-SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612"
+SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/610/612"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://../../LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
 # For backwards compatibility
 PROVIDES += "kernel-module-nxp89xx"
@@ -8,15 +8,14 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.12.3_1.0.0"
 MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
-SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
+SRC_URI = " \
-SRCREV = "a84df583155bad2a396a937056805550bdf655ab"
+    ${MRVL_SRC};branch=${SRCBRANCH} \
+    file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
-S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
+"
+SRCREV = "0396cfb38ad73a3d587cd0f8c139b47801e70891"
 inherit module
 EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
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.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.12.bb
index 9511d6549..ef87e8146 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.12.bb
@@ -28,20 +28,38 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v6.6.28
+#    tag: v6.12.3
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: lf-6.6.3-1.0.00
+#    tag: lf-6.12.3-1.0.0
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
-# - f67cb9a5b4fb7 Revert "net: stmmac: fix FPE events losing"
+# The list includes well-known commits not yet upstreamed. Reverts address merge
-# - 1918c2eb8b07f Revert "dmaengine: fsl-edma: fix DMA channel leak in eDMAv4"
+# conflicts, prioritizing NXP BSP source code as the latest vendor updates.
-# - 42289407ee38f Revert "dmaengine: fsl-edma: Add judgment on enabling round robin arbitration"
+# Additional commits may exist to better acommodate yocto builds.
-# - 952f79923f055 Revert "dmaengine: fsl-edma: Do not suspend and resume the masked dma channel when the system is sleeping"
+#
+# $ git log --oneline  --no-merges v6.12.34.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y
+# - 8d94e52076a1 Revert "firmware: arm_scmi: Fix i.MX build dependency"
+# - adefe4ecd9c6 Revert "PCI: imx6: Fix suspend/resume support on i.MX6QDL"
+# - 2837cecae149 imx8mp-olimex.dts: CSI GPIO pins
+# - 29efe53139ac hwrng: optee: support generic crypto
+# - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states
+# - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST
+# - 1bd794e571f6 gpu: drm: cadence: select hdmi helper
+# - d74361dc9bdc imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error
+# - 90900e871607 arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
+# - 24ef2924dd5f drm: of: Fix build without CONFIG_OF
+# - a97fe216ede5 i2c: imx: Remove unnecessary clock reconfiguration
+# - 93e7f87e7bc6 drm/imx: lcdifv3: Fix videomode settings
+# - ff2397021b0d clk: imx: imx8qm: add more resources to whitelist
+# - e0fc64f7a2f8 arm64: dts: imx8: img: add #address-cells and #size-cells to I2C MIPI CSI nodes
+# - 98b777bfa849 arm64: dts: imx8qm: add missing imx8-ss-cm40.dtsi include
+# - 2d0aefc287a7 arm64: imx_v8_defconfig: Enable CONFIG_GPIO_VF610
+# - 44aadbd00c61 imx8mp-olimex.dts: Olimex iMX8MP-SOM-EVB-IND
 #
 # NOTE to upgraders:
 # This recipe should NOT collect individual patches, they should be applied to
@@ -51,16 +69,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 require linux-imx.inc
-KBRANCH = "6.6-1.0.x-imx"
+KBRANCH = "6.12-1.0.x-imx"
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-SRCREV = "776652a165f5bbf30c68a5f6213d75b02e8df11c"
+SRCREV = "c63da44a120c9ad720877a74f0c94e2d9b08cab1"
 # 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.6.28"
+LINUX_VERSION = "6.12.34"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
@@ -68,7 +86,7 @@ KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig"
 KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig"
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
-LOCALVERSION = "-lf-6.6.y"
+LOCALVERSION = "-lf-6.12.y"
 DEFAULT_PREFERENCE = "1"
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
new file mode 100644
index 000000000..cc067262a
--- /dev/null
+++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
@@ -0,0 +1,37 @@
+# Copyright (C) 2012-2024 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# SPDX-License-Identifier: MIT
+#
+SUMMARY = "FSL Community BSP Linux LTS based kernel with backported features and fixes"
+DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in order to \
+provide support for some backported features and fixes, or because it was applied in upstream \
+and will not become part of a LTS version, or because it is not applicable for \
+upstreaming in any form."
+require linux-imx.inc
+SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
+# 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.6.52"
+KBRANCH = "6.6.x+fslc"
+SRCREV = "3768fbd9dd8e0da9e7a24366b6a65a7f8ca25986"
+KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx8-generic-bsp = "defconfig"
+KBUILD_DEFCONFIG:mx9-generic-bsp = "defconfig"
+KBUILD_DEFCONFIG:mxs-generic-bsp = "mxs_defconfig"
+KBUILD_DEFCONFIG:vf-generic-bsp = "imx_v6_v7_defconfig"
+LOCALVERSION = "-fslc"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.12.bb
index 9132435e4..8b66b82d4 100644
--- a/recipes-kernel/linux/linux-fslc_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc_6.12.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2024 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
 # SPDX-License-Identifier: MIT
@@ -14,19 +14,24 @@ require linux-imx.inc
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
+DEPENDS += " \
+    coreutils-native \
+"
 # 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.6.28"
+#
+# Linux kernel stable 6.12.34 changelog:
+# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34
+LINUX_VERSION = "6.12.34"
-KBRANCH = "6.6.x+fslc"
+KBRANCH = "6.12.x+fslc"
-SRCREV = "3beb6fac2c3bda9015892dae8556c5559f2ee234"
+SRCREV = "e92f5b7050c74e8052f071fd2f1d233d9a4b2f30"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
-KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
-KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx8-generic-bsp = "defconfig"
diff --git a/recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch b/recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch
new file mode 100644
index 000000000..1750d6247
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch
@@ -0,0 +1,54 @@
+From a5bcb18b42cfc0485397da9f48be6a73de86dfac Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sat, 10 May 2025 14:21:35 +0200
+Subject: [PATCH] video: fbdev: mxc: make uapi ipu.h, pxp_dma.h compatible with
+ c23 standard
+In C23 standard bool, false, true are reserved keywords.
+Make ipu.h, pxp_dma.h uapi include file compatible with C23 standard.
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ include/uapi/linux/ipu.h     | 4 ++++
+ include/uapi/linux/pxp_dma.h | 4 ++++
+ 2 files changed, 8 insertions(+)
+diff --git a/include/uapi/linux/ipu.h b/include/uapi/linux/ipu.h
+index c92f292bcc9d..a7b60730bbd4 100644
+--- a/include/uapi/linux/ipu.h
+++ b/include/uapi/linux/ipu.h
+@@ -29,9 +29,13 @@
+ #include <linux/videodev2.h>
+ 
+ #ifndef __KERNEL__
+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
+/* bool, true and false are keywords.  */
+#else
+ #ifndef __cplusplus
+ typedef unsigned char bool;
+ #endif
+#endif
+ #define irqreturn_t int
+ #define dma_addr_t int
+ #define uint32_t unsigned int
+diff --git a/include/uapi/linux/pxp_dma.h b/include/uapi/linux/pxp_dma.h
+index 9b5228504095..e2deff07516d 100644
+--- a/include/uapi/linux/pxp_dma.h
+++ b/include/uapi/linux/pxp_dma.h
+@@ -25,8 +25,12 @@
+ 
+ #ifndef __KERNEL__
+ typedef unsigned long dma_addr_t;
+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
+/* bool, true and false are keywords.  */
+#else
+ typedef unsigned char bool;
+ #endif
+#endif
+ 
+ /*  PXP Pixel format definitions */
+ /*  Four-character-code (FOURCC) */
+-- 
+2.42.0
diff --git a/recipes-kernel/linux/linux-imx-headers_6.6.bb b/recipes-kernel/linux/linux-imx-headers_6.12.bb
index 95ec32b04..2f5ba04ee 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.6.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.12.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 SUMMARY = "Installs i.MX-specific kernel headers"
@@ -7,12 +7,13 @@ New headers are installed in ${includedir}/imx."
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = " \
-SRCBRANCH = "lf-6.6.y"
+    git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
-LOCALVERSION = "-6.6.3-1.0.0"
+    file://0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch \
-SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a"
+"
+SRCBRANCH = "lf-6.12.y"
-S = "${WORKDIR}/git"
+LOCALVERSION = "-lts-${SRCBRANCH}"
+SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
 do_configure[noexec] = "1"
@@ -24,7 +25,6 @@ IMX_UAPI_HEADERS = " \
    hx280enc.h \
    ipu.h \
    imx_vpu.h \
-    mxc_asrc.h \
    mxc_dcic.h \
    mxc_mlb.h \
    mxc_sim_interface.h \
@@ -36,6 +36,11 @@ IMX_UAPI_HEADERS = " \
    videodev2.h \
 "
+IMX_UAPI_HEADERS_SOUND = " \
+    sound/compress_offload.h \
+    sound/compress_params.h \
+"
 do_install() {
    # We install all headers inside of B so we can copy only the
    # i.MX-specific ones, and there is no risk of a new header to be
@@ -57,6 +62,11 @@ do_install() {
        install -D -m 0644 ${B}${includedir}/linux/$h \
                       ${D}${includedir}/imx/linux/$h
    done
+    install -d ${D}${includedir}/imx/linux/sound
+    for h in ${IMX_UAPI_HEADERS_SOUND}; do
+        install -D -m 0644 ${B}${includedir}/$h \
+                       ${D}${includedir}/imx/$h
+    done
 }
 # Allow to build empty main package, this is required in order for -dev package
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 34d50cfc0..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.
@@ -33,7 +31,7 @@ S = "${WORKDIR}/git"
 # specified, and should be restored with their defaults, not set to 'n'.
 # To properly expand a defconfig like this, we need to specify: KCONFIG_MODE="--alldefconfig"
 # in the kernel recipe include.
-KCONFIG_MODE="--alldefconfig"
+KCONFIG_MODE = "--alldefconfig"
 # We need to pass it as param since kernel might support more then one
 # machine, with different entry points
diff --git a/recipes-kernel/linux/linux-imx_6.6.bb b/recipes-kernel/linux/linux-imx_6.12.bb
index 409e1f662..05d9c4ea6 100644
--- a/recipes-kernel/linux/linux-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-imx_6.12.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 (C) Freescale Semiconductor
-# Copyright 2017-2023 (C) NXP
+# Copyright 2017-2024 (C) NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
@@ -12,16 +12,16 @@ 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.6.y"
+SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.6.3-1.0.0"
+LOCALVERSION = "-6.12.3-1.1.0"
-SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a"
+SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
 # 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.6.3"
+LINUX_VERSION = "6.12.3"
 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..7243a345c 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -5,8 +5,6 @@ SUMMARY = "Linux Kernel for NXP QorIQ platforms"
 SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
-S = "${WORKDIR}/git"
 DEPENDS:append = " libgcc"
 # not put Images into /boot of rootfs, install kernel-image if needed
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -44,13 +42,13 @@ 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 "${UNPACKDIR}/${deltacfg}" ]; then
-            ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
+            ${S}/scripts/kconfig/merge_config.sh -m .config ${UNPACKDIR}/${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
diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
index 9e75f5efb..cc226bd9a 100644
--- a/recipes-kernel/skmm-host/skmm-host_git.bb
+++ b/recipes-kernel/skmm-host/skmm-host_git.bb
@@ -8,9 +8,7 @@ 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}"'
-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
new file mode 100644
index 000000000..ae762cb9a
--- /dev/null
+++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb
@@ -0,0 +1,36 @@
+SUMMARY = "The Linux driver stack for Arm(R) Ethos(TM)-U NPU"
+DESCRIPTION = "The Linux driver stack for Arm(R) Ethos(TM)-U provides \
+an example of how a rich operating system like Linux can dispatch \
+inferences to an Arm Cortex(R)-M subsystem, consisting of an Arm \
+Cortex-M of choice and an Arm Ethos-U NPU."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
+DEPENDS = "flatbuffers python3-pybind11 python3-pybind11-native"
+SRC_URI = "${ETHOS_U_SRC};branch=${SRCBRANCH}"
+ETHOS_U_SRC ?= "git://github.com/nxp-imx/ethos-u-driver-stack-imx.git;protocol=https"
+SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCREV = "a80c51d77c91f1a8266afc5d8056fb981de4b504"
+inherit cmake setuptools3
+SETUPTOOLS_BUILD_ARGS = "build_ext --library-dirs ${B}/driver_library"
+do_configure() {
+    cmake_do_configure
+}
+do_compile () {
+    cmake_do_compile
+    setuptools3_do_compile
+}
+do_install () {
+    cmake_do_install
+    setuptools3_do_install
+}
+RDEPENDS:${PN} = "flatbuffers python3-numpy python3-pillow"
+COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
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
new file mode 100644
index 000000000..1f16dce90
--- /dev/null
+++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb
@@ -0,0 +1,28 @@
+SUMMARY = "The firmware of Cortex(R)-M33 for Arm(R) Ethos(TM)-U NPU"
+DESCRIPTION = "The firmware of Cortex(R)-M33 for Arm(R) Ethos(TM)-U NPU"
+LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-3-Clause"
+LIC_FILES_CHKSUM = "\
+    file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e \
+    file://LICENSE-GPL-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE-BSD-3.txt;md5=0858ec9c7a80c4a2cf16e4f825a2cc91 \
+"
+SRC_URI = "${ETHOS_U_FIRMWARE_SRC};branch=${SRCBRANCH}"
+ETHOS_U_FIRMWARE_SRC ?= "git://github.com/nxp-imx/ethos-u-firmware.git;protocol=https"
+SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCREV = "3dbedc11bd2a4ba56af9fbe9d285b5bf13f1a088"
+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"
+ETHOS_U_FIRMWARE:imx93-14x14-lpddr4x-evk = "ethosu_firmware_14x14"
+do_install () {
+    install -d ${D}${nonarch_base_libdir}/firmware
+    install -m 0644 ${S}/${ETHOS_U_FIRMWARE} ${D}${nonarch_base_libdir}/firmware/ethosu_firmware
+}
+FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
+INSANE_SKIP:${PN} = "arch"
+COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
index 7d20c6782..7ae8b8fef 100644
--- a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
@@ -1,4 +1,4 @@
-From 49a7eac8e02c33cae8a168e6d22d9ff8aaf86d44 Mon Sep 17 00:00:00 2001
+From 3fa81ebaf8bac6b167776888ae26c6c140d8aebc Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <b02247@freescale.com>
 Date: Thu, 5 Jun 2014 17:37:47 +0800
 Subject: [PATCH] add conf for multichannel support in imx
@@ -6,19 +6,18 @@ Subject: [PATCH] add conf for multichannel support in imx
 Upstream-Status: Inappropriate [platform specific]
 Signed-off-by: Shengjiu Wang <b02247@freescale.com>
 ---
 src/conf/cards/CS42888.conf  | 94 ++++++++++++++++++++++++++++++++++++
 src/conf/cards/IMX-HDMI.conf | 67 +++++++++++++++++++++++++
- src/conf/cards/Makefile.am   |  4 +-
+ src/conf/cards/Makefile.am   |  2 +
 src/conf/cards/aliases.conf  |  2 +
- 4 files changed, 166 insertions(+), 1 deletion(-)
+ 4 files changed, 165 insertions(+)
 create mode 100644 src/conf/cards/CS42888.conf
 create mode 100644 src/conf/cards/IMX-HDMI.conf
 diff --git a/src/conf/cards/CS42888.conf b/src/conf/cards/CS42888.conf
 new file mode 100644
-index 0000000..671a284
+index 000000000000..671a2845894b
 --- /dev/null
 +++ b/src/conf/cards/CS42888.conf
 @@ -0,0 +1,94 @@
@@ -118,7 +117,7 @@ index 0000000..671a284
 +# vim: ft=alsaconf
 diff --git a/src/conf/cards/IMX-HDMI.conf b/src/conf/cards/IMX-HDMI.conf
 new file mode 100644
-index 0000000..a51509e
+index 000000000000..a51509e8ad5a
 --- /dev/null
 +++ b/src/conf/cards/IMX-HDMI.conf
 @@ -0,0 +1,67 @@
@@ -190,22 +189,20 @@ index 0000000..a51509e
 +
 +# vim: ft=alsaconf
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index 00999f0..fbf0697 100644
+index f387cf4197da..cbd2cd04227d 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -58,7 +58,9 @@ cfg_files = aliases.conf \
+@@ -1,6 +1,8 @@
-        VIA8237.conf \
+ alsaconfigdir = @ALSA_CONFIG_DIR@
-        VX222.conf \
+ alsadir = $(alsaconfigdir)/cards
-        VXPocket.conf \
+ cfg_files = aliases.conf \
-       VXPocket440.conf
-+       VXPocket440.conf \
 +       CS42888.conf \
-+       IMX-HDMI.conf
+       IMX-HDMI.conf \
- 
+        AACI.conf \
- if BUILD_ALISP
+        ATIIXP.conf \
- cfg_files += aliases.alisp
+        ATIIXP-SPDMA.conf \
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 7e352f7..a9e6d76 100644
+index a54824ae636b..0aa874d7434f 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788
@@ -217,3 +214,6 @@ index 7e352f7..a9e6d76 100644
 
 <confdir:ctl/default.conf>
 <confdir:pcm/default.conf>
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
index 5ec0d2e99..193d507eb 100644
--- a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
@@ -1,4 +1,4 @@
-From aa4f56c3c952269c36464cc0da9db5a1381648fa Mon Sep 17 00:00:00 2001
+From 3950e1ae36ca53a67b7248137e6033e7e99f79a3 Mon Sep 17 00:00:00 2001
 From: Jaroslav Kysela <perex@perex.cz>
 Date: Wed, 9 Nov 2022 08:11:42 +0100
 Subject: [PATCH] pcm: rate - fix the crash in
@@ -24,10 +24,10 @@ Signed-off-by: Jaroslav Kysela <perex@perex.cz>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index 6bb90b8b..ec64604c 100644
+index 9d7e233e8437..d58789eca73b 100644
 --- a/src/pcm/pcm_plugin.c
 +++ b/src/pcm/pcm_plugin.c
-@@ -622,7 +622,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv(
+@@ -626,7 +626,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv(
                 * This code is also used by extplug, but extplug does not allow to alter the sampling rate.
                 */
                if (conv)
@@ -37,5 +37,5 @@ index 6bb90b8b..ec64604c 100644
                if (slave->avail_min != needed_slave_avail_min) {
                        snd_pcm_sw_params_t *swparams;
 -- 
-2.34.1
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
index b25aa910e..51e199821 100644
--- a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
@@ -1,4 +1,4 @@
-From d78b7e2b964c9713c2e9889f4ec85922528ba971 Mon Sep 17 00:00:00 2001
+From 92d2b7d91bc1ec4068ee9371753bb24ad1108827 Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <shengjiu.wang@nxp.com>
 Date: Wed, 31 Jan 2018 15:06:53 +0800
 Subject: [PATCH] add ak4458 conf for multichannel support
@@ -12,17 +12,16 @@ maximum 8 channels, but ak4458 may support 16 channels
 Upstream-Status: Inappropriate [i.MX specific]
 Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
 ---
 src/conf/cards/AK4458.conf  | 74 +++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am  |  3 +-
+ src/conf/cards/Makefile.am  |  1 +
 src/conf/cards/aliases.conf |  1 +
- 3 files changed, 77 insertions(+), 1 deletion(-)
+ 3 files changed, 76 insertions(+)
 create mode 100644 src/conf/cards/AK4458.conf
 diff --git a/src/conf/cards/AK4458.conf b/src/conf/cards/AK4458.conf
 new file mode 100644
-index 0000000..3b5b195
+index 000000000000..3b5b195f2ca0
 --- /dev/null
 +++ b/src/conf/cards/AK4458.conf
 @@ -0,0 +1,74 @@
@@ -101,21 +100,19 @@ index 0000000..3b5b195
 +       slave.channels 8
 +}
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index fbf0697..34fa5a3 100644
+index cbd2cd04227d..3c29bd65d341 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -60,7 +60,8 @@ cfg_files = aliases.conf \
+@@ -3,6 +3,7 @@ alsadir = $(alsaconfigdir)/cards
-        VXPocket.conf \
+ cfg_files = aliases.conf \
-        VXPocket440.conf \
        CS42888.conf \
-       IMX-HDMI.conf
+        IMX-HDMI.conf \
-+       IMX-HDMI.conf \
+       AK4458.conf \
-+       AK4458.conf
+        AACI.conf \
- 
+        ATIIXP.conf \
- if BUILD_ALISP
+        ATIIXP-SPDMA.conf \
- cfg_files += aliases.alisp
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index a9e6d76..2f0a22a 100644
+index 0aa874d7434f..dda71d99916e 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -59,6 +59,7 @@ pistachio cards.pistachio-card
@@ -126,3 +123,6 @@ index a9e6d76..2f0a22a 100644
 
 <confdir:ctl/default.conf>
 <confdir:pcm/default.conf>
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
index 1f558185d..db76eb749 100644
--- a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
@@ -1,4 +1,4 @@
-From 36aae65dc913e1ebe72366d7ae361897d465e88d Mon Sep 17 00:00:00 2001
+From faa9791070520f8d5e7060e5668efd1302c86c66 Mon Sep 17 00:00:00 2001
 From: Viorel Suman <viorel.suman@nxp.com>
 Date: Mon, 9 Mar 2020 14:25:46 +0200
 Subject: [PATCH] add conf for iMX XCVR sound card
@@ -6,17 +6,16 @@ Subject: [PATCH] add conf for iMX XCVR sound card
 Upstream-Status: Pending
 Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
 ---
 src/conf/cards/IMX-XCVR.conf | 39 ++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am   |  3 ++-
+ src/conf/cards/Makefile.am   |  1 +
 src/conf/cards/aliases.conf  |  1 +
- 3 files changed, 42 insertions(+), 1 deletion(-)
+ 3 files changed, 41 insertions(+)
 create mode 100755 src/conf/cards/IMX-XCVR.conf
 diff --git a/src/conf/cards/IMX-XCVR.conf b/src/conf/cards/IMX-XCVR.conf
 new file mode 100755
-index 0000000..009000c
+index 000000000000..009000c63a19
 --- /dev/null
 +++ b/src/conf/cards/IMX-XCVR.conf
 @@ -0,0 +1,39 @@
@@ -60,21 +59,19 @@ index 0000000..009000c
 +       preamble.y 0x3
 +}
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index 34fa5a3..70b9bab 100644
+index 3c29bd65d341..4502919e3bec 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -61,7 +61,8 @@ cfg_files = aliases.conf \
+@@ -4,6 +4,7 @@ cfg_files = aliases.conf \
-        VXPocket440.conf \
        CS42888.conf \
        IMX-HDMI.conf \
-       AK4458.conf
+        AK4458.conf \
-+       AK4458.conf \
+       IMX-XCVR.conf \
-+       IMX-XCVR.conf
+        AACI.conf \
- 
+        ATIIXP.conf \
- if BUILD_ALISP
+        ATIIXP-SPDMA.conf \
- cfg_files += aliases.alisp
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 2f0a22a..e824145 100644
+index dda71d99916e..6dab14855f25 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi
@@ -85,3 +82,6 @@ index 2f0a22a..e824145 100644
 
 <confdir:ctl/default.conf>
 <confdir:pcm/default.conf>
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
index 64e15be4a..fa71078e4 100644
--- a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
@@ -1,107 +1,109 @@
-From 97d5e09a4166b45c567026e51b8a25ef5d7d587d Mon Sep 17 00:00:00 2001
+From 38d84440a7bec9e26380f08f050b2ada772b822e Mon Sep 17 00:00:00 2001
-From: Chancel Liu <chancel.liu@nxp.com>
+From: Chancel Liu <chancel.liu@nxp.com>
-Date: Fri, 29 Jul 2022 16:12:37 +0800
+Date: Fri, 29 Jul 2022 16:12:37 +0800
-Subject: [PATCH] add conf for imx-cs42448 sound card
+Subject: [PATCH] add conf for imx-cs42448 sound card
+MIME-Version: 1.0
-Upstream-Status: Inappropriate [i.MX specific]
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
+Upstream-Status: Inappropriate [i.MX specific]
- src/conf/cards/CS42448.conf | 58 +++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am  |  3 +-
+Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
- src/conf/cards/aliases.conf |  1 +
+---
- 3 files changed, 61 insertions(+), 1 deletion(-)
+ src/conf/cards/CS42448.conf | 58 +++++++++++++++++++++++++++++++++++++
- create mode 100644 src/conf/cards/CS42448.conf
+ src/conf/cards/Makefile.am  |  1 +
+ src/conf/cards/aliases.conf |  1 +
-diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf
+ 3 files changed, 60 insertions(+)
-new file mode 100644
+ create mode 100644 src/conf/cards/CS42448.conf
-index 00000000..28ba5c48
--- /dev/null
+diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf
-+++ b/src/conf/cards/CS42448.conf
+new file mode 100644
-@@ -0,0 +1,58 @@
+index 000000000000..28ba5c485837
-+#
+--- /dev/null
-+# Configuration for the CS42448 chip
+++ b/src/conf/cards/CS42448.conf
-+#
+@@ -0,0 +1,58 @@
-+
+#
-+# default with dmix & dsnoop
+# Configuration for the CS42448 chip
-+CS42448.pcm.default {
+#
-+       @args [ CARD ]
+
-+       @args.CARD {
+# default with dmix & dsnoop
-+               type string
+CS42448.pcm.default {
-+       }
+       @args [ CARD ]
-+       type asym
+       @args.CARD {
-+       playback.pcm {
+               type string
-+               type plug
+       }
-+               slave.pcm {
+       type asym
-+                       @func concat
+       playback.pcm {
-+                       strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
+               type plug
-+               }
+               slave.pcm {
-+       }
+                       @func concat
-+       capture.pcm {
+                       strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
-+               type plug
+               }
-+               slave.pcm {
+       }
-+                       @func concat
+       capture.pcm {
-+                       strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
+               type plug
-+               }
+               slave.pcm {
-+       }
+                       @func concat
-+}
+                       strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
-+
+               }
-+<confdir:pcm/surround51.conf>
+       }
-+
+}
-+CS42448.pcm.surround51.0 {
+
-+       @args [ CARD ]
+<confdir:pcm/surround51.conf>
-+       @args.CARD {
+
-+               type string
+CS42448.pcm.surround51.0 {
-+       }
+       @args [ CARD ]
-+       type plug
+       @args.CARD {
-+       slave.pcm {
+               type string
-+               type hw
+       }
-+               card $CARD
+       type plug
-+       }
+       slave.pcm {
-+       slave.channels 6
+               type hw
-+}
+               card $CARD
-+
+       }
-+<confdir:pcm/surround71.conf>
+       slave.channels 6
-+
+}
-+CS42448.pcm.surround71.0 {
+
-+       @args [ CARD ]
+<confdir:pcm/surround71.conf>
-+       @args.CARD {
+
-+               type string
+CS42448.pcm.surround71.0 {
-+       }
+       @args [ CARD ]
-+       type plug
+       @args.CARD {
-+       slave.pcm {
+               type string
-+               type hw
+       }
-+               card $CARD
+       type plug
-+       }
+       slave.pcm {
-+       slave.channels 8
+               type hw
-+}
+               card $CARD
-+
+       }
-+# vim: ft=alsaconf
+       slave.channels 8
-diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
+}
-index 70b9bab3..6aba20b4 100644
+
--- a/src/conf/cards/Makefile.am
+# vim: ft=alsaconf
-+++ b/src/conf/cards/Makefile.am
+diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-@@ -62,7 +62,8 @@ cfg_files = aliases.conf \
+index 4502919e3bec..da2def3a9498 100644
-        CS42888.conf \
+--- a/src/conf/cards/Makefile.am
-        IMX-HDMI.conf \
+++ b/src/conf/cards/Makefile.am
-        AK4458.conf \
+@@ -5,6 +5,7 @@ cfg_files = aliases.conf \
-       IMX-XCVR.conf
+        IMX-HDMI.conf \
-+       IMX-XCVR.conf \
+        AK4458.conf \
-+       CS42448.conf
+        IMX-XCVR.conf \
- 
+       CS42448.conf \
- if BUILD_ALISP
+        AACI.conf \
- cfg_files += aliases.alisp
+        ATIIXP.conf \
-diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
+        ATIIXP-SPDMA.conf \
-index e824145d..a40d3731 100644
+diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
--- a/src/conf/cards/aliases.conf
+index 6dab14855f25..554db846f8e5 100644
-+++ b/src/conf/cards/aliases.conf
+--- a/src/conf/cards/aliases.conf
-@@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888
+++ b/src/conf/cards/aliases.conf
- imx-hdmi-soc cards.IMX-HDMI
+@@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888
- ak4458-audio cards.AK4458
+ imx-hdmi-soc cards.IMX-HDMI
- imx-audio-xcvr cards.IMX-XCVR
+ ak4458-audio cards.AK4458
-+imx-cs42448 cards.CS42448
+ imx-audio-xcvr cards.IMX-XCVR
- 
+imx-cs42448 cards.CS42448
- <confdir:ctl/default.conf>
+ 
- <confdir:pcm/default.conf>
+ <confdir:ctl/default.conf>
-- 
+ <confdir:pcm/default.conf>
-2.17.1
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 65498aed1..230cf0957 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -10,6 +10,3 @@ IMX_PATCH = " \
 SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
 PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
-GLIBC_64BIT_TIME_FLAGS = ""
-INSANE_SKIP:append = " 32bit-time"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index e2acf7676..e87a47020 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-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale alsa-lib plugins"
@@ -20,14 +20,10 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
-SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"
+SRCREV = "eaf0900662d6381bcc433165219280cca1752890"
-S = "${WORKDIR}/git"
+CFLAGS:append = " -I${STAGING_INCDIR_IMX}"
-INCLUDE_DIR = "-I${STAGING_INCDIR_IMX}"
-EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}""
 PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}"
 PACKAGECONFIG_SWPDM             = ""
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb
new file mode 100644
index 000000000..9f7f890d5
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb
@@ -0,0 +1,52 @@
+SUMMARY = "Gstreamer validation tool"
+DESCRIPTION = "A Tool to test GStreamer components"
+HOMEPAGE = "https://gstreamer.freedesktop.org/documentation/gst-devtools/index.html"
+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-1.22.5.tar.xz \
+           file://0001-connect-has-a-different-signature-on-musl.patch \
+           "
+SRC_URI[sha256sum] = "2add1519aa6eeb01d544cb94293688ee3bc2079f6bca6075bf5c23d00a0921be"
+DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
+RRECOMMENDS:${PN} = "git"
+FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*"
+inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection
+# TODO: put this in a gettext.bbclass patch
+def gettext_oemeson(d):
+    if d.getVar('USE_NLS') == 'no':
+        return '-Dnls=disabled'
+    # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
+    if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'):
+        return '-Dnls=disabled'
+    return '-Dnls=enabled'
+# Build GstValidateVideo
+PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Ddebug_viewer=disabled \
+    -Dtests=disabled \
+    -Dvalidate=enabled \
+    ${@gettext_oemeson(d)} \
+"
+do_install:append () {
+     for fn in ${bindir}/gst-validate-launcher \
+         ${libdir}/gst-validate-launcher/python/launcher/config.py; do
+             sed -i -e 's,${B},/usr/src/debug/${PN},g' -e 's,${S},/usr/src/debug/${PN},g' ${D}$fn
+     done
+}
+GIR_MESON_ENABLE_FLAG = "enabled"
+GIR_MESON_DISABLE_FLAG = "disabled"
diff --git a/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch b/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
new file mode 100644
index 000000000..828c87dc9
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
@@ -0,0 +1,37 @@
+From 7924016fce2d0b435891a335cdae52fc939c7e3b Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 17 Aug 2017 11:07:02 +0300
+Subject: [PATCH] Make player examples installable
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Denied [Upstream considers these code examples, for now a least]
+https://bugzilla.gnome.org/show_bug.cgi?id=777827
+---
+ playback/player/gst-play/meson.build | 1 +
+ playback/player/gtk/meson.build      | 1 +
+ 2 files changed, 2 insertions(+)
+Index: gst-examples/playback/player/gst-play/meson.build
+===================================================================
+--- gst-examples.orig/playback/player/gst-play/meson.build
+++ gst-examples/playback/player/gst-play/meson.build
+@@ -2,5 +2,6 @@ executable('gst-play',
+     ['gst-play.c',
+      'gst-play-kb.c',
+      'gst-play-kb.h'],
+    install: true,
+     dependencies : [gst_dep, dependency('gstreamer-play-1.0'), m_dep])
+ 
+Index: gst-examples/playback/player/gtk/meson.build
+===================================================================
+--- gst-examples.orig/playback/player/gtk/meson.build
+++ gst-examples/playback/player/gtk/meson.build
+@@ -20,5 +20,6 @@ if gtk_dep.found()
+        'gtk-video-renderer.h',
+        'gtk-video-renderer.c'],
+       c_args :  extra_c_args,
+      install: true,
+       dependencies : [gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep])
+ endif
diff --git a/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
new file mode 100644
index 000000000..d165e5d91
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Media Player
+Comment=Basic media player
+Icon=video-player
+TryExec=gtk-play
+Exec=gtk-play
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GTK;AudioVideo;
diff --git a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
new file mode 100644
index 000000000..9db0051a1
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
@@ -0,0 +1,38 @@
+# This builds an older version which is compatible with the gstreamer NXP fork 1.24.7.imx,
+# thus the version is appended with '.imx'
+SUMMARY = "GStreamer examples (including gtk-play, gst-play)"
+DESCRIPTION = "GStreamer example applications."
+HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples"
+BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9"
+DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 json-glib glib-2.0-native"
+SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.24 \
+           file://0001-Make-player-examples-installable.patch \
+           file://gst-player.desktop \
+           "
+SRCREV = "0f1e984e41ce8d6d0758265d35e8b10d5815fde2"
+S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
+inherit meson pkgconfig features_check
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+do_install:append() {
+        install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
+}
+RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
+RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \
+                     gstreamer1.0-plugins-good-meta \
+                     gstreamer1.0-plugins-bad-meta \
+                      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
+                     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}"
+RPROVIDES:${PN} += "gst-player gst-player-bin"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb
new file mode 100644
index 000000000..bf61d4192
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Libav-based GStreamer 1.x plugin"
+DESCRIPTION = "Contains a GStreamer plugin for using the encoders, decoders, \
+muxers, and demuxers provided by FFmpeg."
+HOMEPAGE = "http://gstreamer.freedesktop.org/"
+SECTION = "multimedia"
+# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency
+LICENSE_FLAGS = "commercial"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
+                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
+                    "
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz"
+SRC_URI[sha256sum] = "c3e4179ba183c2d3101edf87ff70dd07e728c766a5fee34e6ecded76ca5802df"
+S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
+inherit meson pkgconfig upstream-version-is-even
+EXTRA_OEMESON += " \
+    -Dtests=disabled \
+"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
deleted file mode 100644
index 188476035..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_OEMESON:append:imx-nxp-bsp = " -Dtests=disabled -Dexamples=disabled"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
deleted file mode 100644
index 029b80e17..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3bc5d48257032b6bbee532aad15062fbbcc43bfe Mon Sep 17 00:00:00 2001
-From: Andrey Zhizhikin <andrey.z@gmail.com>
-Date: Mon, 27 Jan 2020 10:22:35 +0000
-Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
-When Yocto build is performed, opencv searches for data dir using simple
-'test' command, this fails because pkg-config provides an absolute
-path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR
-in order for the 'test' utility to pick up the absolute path.
-Upstream-Status: Inappropriate [OE-specific]
-Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- ext/opencv/meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
-index 1d86b90..b5c8b95 100644
--- a/ext/opencv/meson.build
-+++ b/ext/opencv/meson.build
-@@ -87,6 +87,9 @@ if opencv_found
-   opencv_prefix = opencv_dep.get_variable('prefix')
-   gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
- 
-+  pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
-+  opencv_prefix = pkgconf_sysroot + opencv_prefix
-+
-   # Check the data dir used by opencv for its xml data files
-   # Use prefix from pkg-config to be compatible with cross-compilation
-   r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb
index 3366a6274..7aa22436c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb
@@ -178,19 +178,19 @@ FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs"
 DEFAULT_PREFERENCE = "-1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
-DEPENDS:append:imxgpu2d = " virtual/libg2d"
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
                   file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
-                   file://0002-avoid-including-sys-poll.h-directly.patch"
+                   file://0002-avoid-including-sys-poll.h-directly.patch \
+                   file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
+                   "
 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.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
-SRCREV = "9de821c50b4dd7af2407d9c3d078020704510a20"
+SRCREV = "7bb1254fcb0a0dcb1ecb4ac21efbc5068151943d"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 inherit use-imx-headers
@@ -215,9 +215,9 @@ EXTRA_OEMESON += " \
    -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+EXTRA_OEMESON:remove = " \
+    -Dkate=disabled \
+"
-# it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
-#
-TOOLCHAIN = "gcc"
 ########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch
deleted file mode 100644
index 3ab4bab45..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 90b94ff95c72487054fd283fb7cb5ebd13822b3f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 7 Aug 2023 18:56:05 -0700
-Subject: [PATCH] gstallocator: Fix typcasts
-These are found when building with clang+musl
-| ../git/gst-libs/gst/allocators/gstallocatorphymem.c:228:10: error: incompatible pointer to integer conversion returning 'gpointer' (aka 'void *') from a function with result type 'guintptr
-' (aka 'unsigned long') [-Wint-conversion]
-|   228 |   return gst_phymem_get_phy (mem);
-|       |          ^~~~~~~~~~~~~~~~~~~~~~~~
-Upstream-Status: Submitted [https://github.com/nxp-imx/gst-plugins-base/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- gst-libs/gst/allocators/gstallocatorphymem.c | 2 +-
- gst-libs/gst/gl/gstglphymemory.c             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/gst-libs/gst/allocators/gstallocatorphymem.c b/gst-libs/gst/allocators/gstallocatorphymem.c
-index f3c3306c7..f8a4511ab 100755
--- a/gst-libs/gst/allocators/gstallocatorphymem.c
-+++ b/gst-libs/gst/allocators/gstallocatorphymem.c
-@@ -225,7 +225,7 @@ static guintptr
- gst_allocator_phymem_get_phys_addr (GstPhysMemoryAllocator * allocator,
-     GstMemory * mem)
- {
-  return gst_phymem_get_phy (mem);
-+  return (guintptr)gst_phymem_get_phy (mem);
- }
- 
- static void
-diff --git a/gst-libs/gst/gl/gstglphymemory.c b/gst-libs/gst/gl/gstglphymemory.c
-index d82c9a66a..1d8be0a5d 100644
--- a/gst-libs/gst/gl/gstglphymemory.c
-+++ b/gst-libs/gst/gl/gstglphymemory.c
-@@ -337,7 +337,7 @@ gst_gl_physical_memory_setup_buffer (GstAllocator * allocator,
-     GST_VIDEO_INFO_HEIGHT (info),
-     viv_fmt,
-     memblk->vaddr,
-    memblk->paddr,
-+    (guint)memblk->paddr,
-     FALSE
-   };
- 
-- 
-2.41.0
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb
index dd7869a9b..ed6e02435 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb
@@ -116,12 +116,12 @@ SRC_URI:remove = " \
    file://0003-viv-fb-Make-sure-config.h-is-included.patch \
    file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
-SRC_URI:append = " file://0001-gstallocator-Fix-typcasts.patch"
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
-SRCREV = "c4333767ea122c182ba4e14cababe8dbe2a1b882"
+SRCREV = "858ae5a1fb2bd2692ca7ebbd5bde2eee14e1842d"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 inherit use-imx-headers
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend
index ca6636b83..528d7e1a3 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend
@@ -13,5 +13,5 @@ PACKAGECONFIG_GL:use-mainline-bsp = \
 # does not depend on the viv-fb feature. It used to, but that was actually a bug
 # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is
 # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".)
-PACKAGECONFIG_GL:append:mx6-nxp-bsp = " viv-fb "
+PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb"
-PACKAGECONFIG_GL:append:mx7ulp-nxp-bsp = " viv-fb "
+PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb
index 9e09ef930..28044ccd1 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb
@@ -94,11 +94,11 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
 DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+    file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \
    file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \
 "
 # Enable pulsesink in gstreamer
-PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', ' pulseaudio', '', d)}"
 # fb implementation of v4l2 uses libdrm
 DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}"
@@ -111,16 +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.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
-SRCREV = "d361360510c97dc23abbfcdd22dff8214890527d"
+SRCREV = "626a972e9ef448f1017cfad07a3486a0fb340a0d"
-# set 32bit compile timer for 32-bit platform
+S = "${UNPACKDIR}/${BP}"
-GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = ""
-GLIBC_64BIT_TIME_FLAGS:mx7-nxp-bsp = ""
-INSANE_SKIP:mx6-nxp-bsp:append = " 32bit-time"
-INSANE_SKIP:mx7-nxp-bsp:append = " 32bit-time"
-S = "${WORKDIR}/git"
 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 5bf60e623..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
@@ -15,11 +15,9 @@ RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparser
 PV .= "+git${SRCPV}"
 SRCBRANCH ?= "master"
-SRCREV = "cb3cd45676e808b222ac573e8a118f44fd70c288"
+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.24.0.imx.bb
new file mode 100644
index 000000000..23b8c72cb
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb
@@ -0,0 +1,48 @@
+require gstreamer1.0-plugins-common.inc
+require gstreamer1.0-plugins-license.inc
+SUMMARY = "'Ugly GStreamer plugins"
+HOMEPAGE = "https://gstreamer.freedesktop.org/"
+BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/issues"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+                   "
+LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
+LICENSE_FLAGS = "commercial"
+SRC_URI = " \
+            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \
+            "
+SRC_URI[sha256sum] = "c5d1cbdf71ab0c675bca236f70edfa1feb3f813fd4bfff563308f466d8805ca5"
+S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
+DEPENDS += "gstreamer1.0-plugins-base"
+GST_PLUGIN_SET_HAS_EXAMPLES = "0"
+PACKAGECONFIG ??= " \
+    ${GSTREAMER_ORC} \
+"
+PACKAGECONFIG[a52dec]   = "-Da52dec=enabled,-Da52dec=disabled,liba52"
+PACKAGECONFIG[cdio]     = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
+PACKAGECONFIG[dvdread]  = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
+PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
+PACKAGECONFIG[x264]     = "-Dx264=enabled,-Dx264=disabled,x264"
+GSTREAMER_GPL = "${@bb.utils.filter('PACKAGECONFIG', 'a52dec cdio dvdread mpeg2dec x264', d)}"
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Dsidplay=disabled \
+"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
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
new file mode 100644
index 000000000..fd6b1c16e
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch
@@ -0,0 +1,47 @@
+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.24.0.imx.bb
new file mode 100644
index 000000000..cac54e88a
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Python bindings for GStreamer 1.0"
+DESCRIPTION = "GStreamer Python binding overrides (complementing the bindings \
+provided by python-gi) "
+HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/"
+SECTION = "multimedia"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
+SRC_URI = "\
+    https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz \
+    file://0001-meson.build-Fix-missing-python_opt.patch \
+    "
+SRC_URI[sha256sum] = "041c2255c1ea9936c777dcb08a36ecaa6a24a69a12fc46ef53f1530d46c59f9d"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
+RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
+PNREAL = "gst-python"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
+EXTRA_OEMESON += "\
+    -Dtests=disabled \
+    -Dplugin=enabled \
+    -Dlibpython-dir=${libdir} \
+"
+inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+FILES:${PN} += "${libdir}/gstreamer-1.0"
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
new file mode 100644
index 000000000..58255b992
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
@@ -0,0 +1,38 @@
+SUMMARY = "A library on top of GStreamer for building an RTSP server"
+HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/"
+SECTION = "multimedia"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
+PNREAL = "gst-rtsp-server"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI[sha256sum] = "5b0fa6b12ba95b1d336a4b274cbe19e982aa3e6819f1d97bfd8e0102b103ed9b"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
+inherit meson pkgconfig upstream-version-is-even gobject-introspection
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Dexamples=disabled \
+    -Dtests=disabled \
+"
+GIR_MESON_ENABLE_FLAG = "enabled"
+GIR_MESON_DISABLE_FLAG = "disabled"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
+require gstreamer1.0-plugins-packaging.inc
+CVE_PRODUCT += "gst-rtsp-server"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
new file mode 100644
index 000000000..3993730ec
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
@@ -0,0 +1,57 @@
+SUMMARY = "VA-API support to GStreamer"
+HOMEPAGE = "https://gstreamer.freedesktop.org/"
+DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \
+based plugins for GStreamer and helper libraries: `vaapidecode', \
+`vaapiconvert', and `vaapisink'."
+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[sha256sum] = "6b1f3b91ca65dedc67dc67a25dc1d1e464f11825a27ab9c7ac7c1bda67f03596"
+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
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+REQUIRED_DISTRO_FEATURES ?= "opengl"
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Dexamples=disabled \
+    -Dtests=enabled \
+"
+PACKAGES =+ "${PN}-tests"
+# OpenGL packageconfig factored out to make it easy for distros
+# and BSP layers to pick either glx, egl, or no GL. By default,
+# try detecting X11 first, and if found (with OpenGL), use GLX,
+# otherwise try to check if EGL can be used.
+PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', \
+                        bb.utils.contains('DISTRO_FEATURES',     'opengl', 'egl', \
+                                                                       '', d), d)}"
+PACKAGECONFIG ??= "drm encoders \
+                   ${PACKAGECONFIG_GL} \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,udev libdrm"
+PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl"
+PACKAGECONFIG[encoders] = "-Dencoders=enabled,-Dencoders=disabled"
+PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/libgl"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols"
+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxrandr libxrender"
+FILES:${PN} += "${libdir}/gstreamer-*/*.so"
+FILES:${PN}-dbg += "${libdir}/gstreamer-*/.debug"
+FILES:${PN}-dev += "${libdir}/gstreamer-*/*.a"
+FILES:${PN}-tests = "${bindir}/*"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
deleted file mode 100644
index 1b9278db0..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 11 Apr 2021 19:48:13 +0100
-Subject: [PATCH] tests: respect the idententaion used in meson
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- tests/check/meson.build | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 9787b0a..16caac7 100644
--- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -145,11 +145,11 @@ foreach t : core_tests
- 
-   if not skip_test
-     exe = executable(test_name, fname,
-        c_args : gst_c_args + test_defines,
-        cpp_args : gst_c_args + test_defines,
-        include_directories : [configinc],
-        link_with : link_with_libs,
-        dependencies : gst_deps + test_deps,
-+      c_args : gst_c_args + test_defines,
-+      cpp_args : gst_c_args + test_defines,
-+      include_directories : [configinc],
-+      link_with : link_with_libs,
-+      dependencies : gst_deps + test_deps,
-     )
- 
-     env = environment()
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
deleted file mode 100644
index 568e38cbf..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 11 Apr 2021 19:48:13 +0100
-Subject: [PATCH] tests: add support for install the tests
-This will provide to run the tests using the gnome-desktop-testing [1]
-[1] https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- meson.build                  |  4 ++++
- meson_options.txt            |  1 +
- tests/check/meson.build      | 22 +++++++++++++++++++++-
- tests/check/template.test.in |  3 +++
- 4 files changed, 29 insertions(+), 1 deletion(-)
- create mode 100644 tests/check/template.test.in
-diff --git a/meson.build b/meson.build
-index f9f591d..3906fb3 100644
--- a/meson.build
-+++ b/meson.build
-@@ -606,6 +606,10 @@ if bashcomp_dep.found()
-   endif
- endif
- 
-+installed_tests_enabled = get_option('installed_tests')
-+installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
-+installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
-+
- plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
- 
- pkgconfig = import('pkgconfig')
-diff --git a/meson_options.txt b/meson_options.txt
-index 7363bdb..a34ba37 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
- option('memory-alignment', type: 'combo',
-        choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'],
-        value: 'malloc')
-+option('installed_tests', type : 'boolean', value : false, description : 'Enable installed tests')
- 
- # Feature options
- option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 16caac7..f2d400f 100644
--- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -124,10 +124,16 @@ test_defines = [
-   '-UG_DISABLE_ASSERT',
-   '-UG_DISABLE_CAST_CHECKS',
-   '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
-  '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
-   '-DGST_DISABLE_DEPRECATED',
- ]
- 
-+testfile = meson.current_source_dir() + '/meson.build'
-+if installed_tests_enabled
-+  install_data(testfile, install_dir : installed_tests_metadir, rename : 'testfile')
-+  testfile = installed_tests_metadir + '/testfile'
-+endif
-+test_defines += '-DTESTFILE="@0@"'.format(testfile)
-+
- # sanity checking
- if get_option('check').disabled()
-   if get_option('tests').enabled()
-@@ -150,6 +156,8 @@ foreach t : core_tests
-       include_directories : [configinc],
-       link_with : link_with_libs,
-       dependencies : gst_deps + test_deps,
-+      install_dir: installed_tests_execdir,
-+      install: installed_tests_enabled,
-     )
- 
-     env = environment()
-@@ -161,6 +169,18 @@ foreach t : core_tests
-     env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
-     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
- 
-+    if installed_tests_enabled
-+      test_conf = configuration_data()
-+      test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir))
-+      test_conf.set('program', test_name)
-+      configure_file(
-+        input: 'template.test.in',
-+        output: test_name + '.test',
-+        install_dir: installed_tests_metadir,
-+        configuration: test_conf
-+      )
-+    endif
-+
-     test(test_name, exe, env: env, timeout : 3 * 60)
-   endif
- endforeach
-diff --git a/tests/check/template.test.in b/tests/check/template.test.in
-new file mode 100644
-index 0000000..f701627
--- /dev/null
-+++ b/tests/check/template.test.in
-@@ -0,0 +1,3 @@
-+[Test]
-+Type=session
-+Exec=@installed_tests_dir@/@program@
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
deleted file mode 100644
index 10a6dcc61..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sat, 24 Apr 2021 10:34:47 +0100
-Subject: [PATCH 3/4] tests: use a dictionaries for environment
-meson environment() can't be passed to configure_file and it is needed for installed_tests,
-use a dictionary as this is simplest solution to install the environment.
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++-------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
-index 00a138a568..48ec2532f8 100644
--- a/subprojects/gstreamer/tests/check/meson.build
-+++ b/subprojects/gstreamer/tests/check/meson.build
-@@ -161,14 +161,19 @@ foreach t : core_tests
-       install: installed_tests_enabled,
-     )
- 
-    env = environment()
-    env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root())
-    env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
-    env.set('GST_STATE_IGNORE_ELEMENTS', '')
-    env.set('CK_DEFAULT_TIMEOUT', '20')
-    env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
-    env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
-    env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
-+    # meson environment object can't be passed to configure_file and
-+    # installed tests uses configure_file to install the environment.
-+    # use a dictionary as this is the simplest solution
-+    # to install the environment.
-+    env = {
-+      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
-+      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
-+      'GST_STATE_IGNORE_ELEMENTS': '',
-+      'CK_DEFAULT_TIMEOUT': '20',
-+      'GST_REGISTRY': '@0@/@1@.registry'.format(meson.current_build_dir(), test_name),
-+      'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner',
-+      'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer',
-+    }
- 
-     if installed_tests_enabled
-       test_conf = configuration_data()
-- 
-2.33.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
deleted file mode 100644
index efa004f8c..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 2 May 2021 01:58:01 +0100
-Subject: [PATCH 4/4] tests: add helper script to run the installed_tests
- this is a bash script that will run the installed_tests
-with some of the environment variables used in the meson
-testing framework.
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- subprojects/gstreamer/tests/check/meson.build   | 17 +++++++++++++++++
- .../gstreamer/tests/check/template.sh.in        |  9 +++++++++
- .../gstreamer/tests/check/template.test.in      |  2 +-
- 3 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100755 subprojects/gstreamer/tests/check/template.sh.in
-diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
-index 48ec2532f8..7dc4990d4e 100644
--- a/subprojects/gstreamer/tests/check/meson.build
-+++ b/subprojects/gstreamer/tests/check/meson.build
-@@ -185,6 +185,23 @@ foreach t : core_tests
-         install_dir: installed_tests_metadir,
-         configuration: test_conf
-       )
-+
-+      # All the tests will be deployed on the target machine and
-+      # we use the home folder ~ for the registry which will then expand at runtime.
-+      # Using the /tmp/gstreamer-1.0/@0@.registry can be problematic as it mostly
-+      # is mounted using tmpfs and if the machine crash from some reason we can lost the registry
-+      # that is useful for debug propose of the tests itself.
-+      env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@.registry'.format(test_name)}
-+
-+      # Set the full path for the test it self.
-+      env += {'TEST': '@0@/@1@'.format(join_paths(prefix, installed_tests_execdir), test_name)}
-+
-+      configure_file(
-+        input : 'template.sh.in',
-+        output: test_name + '.sh',
-+        install_dir: installed_tests_execdir,
-+        configuration : env,
-+      )
-     endif
- 
-     test(test_name, exe, env: env, timeout : 3 * 60)
-diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in
-new file mode 100755
-index 0000000000..cf7d31b0ea
--- /dev/null
-+++ b/subprojects/gstreamer/tests/check/template.sh.in
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+set -ax
-+
-+CK_DEFAULT_TIMEOUT="@CK_DEFAULT_TIMEOUT@"
-+GST_PLUGIN_LOADING_WHITELIST="@GST_PLUGIN_LOADING_WHITELIST@"
-+GST_REGISTRY=@GST_REGISTRY@
-+GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@"
-+exec @TEST@
-diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in
-index f701627f87..b74ef6ad73 100644
--- a/subprojects/gstreamer/tests/check/template.test.in
-+++ b/subprojects/gstreamer/tests/check/template.test.in
-@@ -1,3 +1,3 @@
- [Test]
- Type=session
-Exec=@installed_tests_dir@/@program@
-+Exec=@installed_tests_dir@/@program@.sh
-- 
-2.33.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch
deleted file mode 100644
index f51df6d20..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b935abba3d8fa3ea1ce384c08e650afd8c20b78a Mon Sep 17 00:00:00 2001
-From: Claudius Heine <ch@denx.de>
-Date: Wed, 2 Feb 2022 13:47:02 +0100
-Subject: [PATCH] tests: remove gstbin:test_watch_for_state_change testcase
-This testcase seems to be flaky, and upstream marked it as such:
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778
-This patch removes the testcase to avoid it interfering with out ptest.
-Signed-off-by: Claudius Heine <ch@denx.de>
-Upstream-Status: Inappropriate [needs proper upstream fix]
---
- tests/check/gst/gstbin.c        | 69 -------------------
- 1 file changed, 69 deletions(-)
-diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c
-index e366d5fe20..ac29d81474 100644
--- a/tests/check/gst/gstbin.c
-+++ b/tests/check/gst/gstbin.c
-@@ -691,74 +691,6 @@ GST_START_TEST (test_message_state_changed_children)
- 
- GST_END_TEST;
- 
-GST_START_TEST (test_watch_for_state_change)
-{
-  GstElement *src, *sink, *bin;
-  GstBus *bus;
-  GstStateChangeReturn ret;
-
-  bin = gst_element_factory_make ("bin", NULL);
-  fail_unless (bin != NULL, "Could not create bin");
-
-  bus = g_object_new (gst_bus_get_type (), NULL);
-  gst_object_ref_sink (bus);
-  gst_element_set_bus (GST_ELEMENT_CAST (bin), bus);
-
-  src = gst_element_factory_make ("fakesrc", NULL);
-  fail_if (src == NULL, "Could not create fakesrc");
-  sink = gst_element_factory_make ("fakesink", NULL);
-  fail_if (sink == NULL, "Could not create fakesink");
-
-  gst_bin_add (GST_BIN (bin), sink);
-  gst_bin_add (GST_BIN (bin), src);
-
-  fail_unless (gst_element_link (src, sink), "could not link src and sink");
-
-  /* change state, spawning two times three messages */
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
-  fail_unless (ret == GST_STATE_CHANGE_ASYNC);
-  ret =
-      gst_element_get_state (GST_ELEMENT (bin), NULL, NULL,
-      GST_CLOCK_TIME_NONE);
-  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
-
-  pop_state_changed (bus, 6);
-  pop_async_done (bus);
-  pop_latency (bus);
-
-  fail_unless (gst_bus_have_pending (bus) == FALSE,
-      "Unexpected messages on bus");
-
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING);
-  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
-
-  pop_state_changed (bus, 3);
-
-  /* this one might return either SUCCESS or ASYNC, likely SUCCESS */
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
-  gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE);
-
-  pop_state_changed (bus, 3);
-  if (ret == GST_STATE_CHANGE_ASYNC) {
-    pop_async_done (bus);
-    pop_latency (bus);
-  }
-
-  fail_unless (gst_bus_have_pending (bus) == FALSE,
-      "Unexpected messages on bus");
-
-  gst_bus_set_flushing (bus, TRUE);
-
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL);
-  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
-
-  /* clean up */
-  gst_object_unref (bus);
-  gst_object_unref (bin);
-}
-
-GST_END_TEST;
-
- GST_START_TEST (test_state_change_error_message)
- {
-   GstElement *src, *sink, *bin;
-@@ -1956,7 +1888,6 @@ gst_bin_suite (void)
-   tcase_add_test (tc_chain, test_message_state_changed);
-   tcase_add_test (tc_chain, test_message_state_changed_child);
-   tcase_add_test (tc_chain, test_message_state_changed_children);
-  tcase_add_test (tc_chain, test_watch_for_state_change);
-   tcase_add_test (tc_chain, test_state_change_error_message);
-   tcase_add_test (tc_chain, test_add_linked);
-   tcase_add_test (tc_chain, test_add_self);
-- 
-2.33.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb
index ce7b3f1d4..a5fc88444 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb
@@ -92,13 +92,20 @@ LIC_FILES_CHKSUM = " \
 "
 # Use i.MX fork of GST for customizations
-SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
+SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
+                  file://0001-tests-respect-the-idententaion-used-in-meson.patch \
+                  file://0002-tests-add-support-for-install-the-tests.patch \
+                  file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
+                  file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
+"
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
-SRCREV = "1a43c16272a7f4274eb8260e03206a57f317d823"
+SRCREV = "e0d37a7d773a502956f54eced8cd701ec7fa5ff5"
+S = "${UNPACKDIR}/${BP}"
-S = "${WORKDIR}/git"
+PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch
deleted file mode 100644
index bdcb3f48e..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 090fb758a63b7d362d9bee8b8a665d1346c83f83 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:15:22 -0700
-Subject: [PATCH 01/10] aiurdemux: Fix type of USER_DATA_LOCATION
-It should be char pointer not integer
-Fixe
-plugins/aiurdemux/aiurdemux.c:198:47: error: incompatible integer to pointer conversion initializin
-g 'const gchar *' (aka 'const char *') with an expression of type 'int' [-Wint-conversion]
-  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1,
-                                              ^~
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiurdemux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/plugins/aiurdemux/aiurdemux.c b/plugins/aiurdemux/aiurdemux.c
-index 532b439..39c50ea 100755
--- a/plugins/aiurdemux/aiurdemux.c
-+++ b/plugins/aiurdemux/aiurdemux.c
-@@ -195,7 +195,7 @@ static AiurDemuxTagEntry g_user_data_entry[] = {
-       "Track Number : %s\n"},
-   {USER_DATA_TOTALTRACKNUMBER, USER_DATA_FORMAT_UTF8, GST_TAG_TRACK_COUNT,
-       "Track Count : %s\n"},
-  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1,
-+  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, (const gchar*)-1,
-       "Location : %s\n"},
-   {USER_DATA_KEYWORDS, USER_DATA_FORMAT_UTF8, GST_TAG_KEYWORDS,
-       "Keywords : %s\n"},
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch
deleted file mode 100644
index d3fdf924b..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8b8322cd4c3a69e5cb47b5cb33abe860e89d6ed Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 20:33:54 -0700
-Subject: [PATCH 02/10] aiurdemux.h: Include glib/gprintf.h for g_printf
- prototype
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiurdemux.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/plugins/aiurdemux/aiurdemux.h b/plugins/aiurdemux/aiurdemux.h
-index 1d7d0a0..f7fcb2e 100755
--- a/plugins/aiurdemux/aiurdemux.h
-+++ b/plugins/aiurdemux/aiurdemux.h
-@@ -39,7 +39,7 @@
- #include <gst/gst.h>
- #include <gst/base/gstadapter.h>
- #include <gst/tag/tag.h>
-
-+#include <glib/gprintf.h>
- //#include "mfw_gst_utils.h"
- 
- #include "fsl_parser.h"
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch
deleted file mode 100644
index a690b4975..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 19e6a541d2026386c9cfdeca0eebd269fef2536c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:29:01 -0700
-Subject: [PATCH 03/10] grecorder: Fix build with clang
-Add missing includes for APIs from libc and glib
-Add prototype declaration for post_message before
-using it in macros later in the same source file
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- tools/grecorder/grecorder.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/tools/grecorder/grecorder.c b/tools/grecorder/grecorder.c
-index c8eff2f..89aa801 100644
--- a/tools/grecorder/grecorder.c
-+++ b/tools/grecorder/grecorder.c
-@@ -23,10 +23,11 @@
- #include <semaphore.h>
- #include <pthread.h>
- #include <signal.h>
-+#include <unistd.h> /* sleep */
- #include <getopt.h>
- #define __USE_LARGEFILE64
- #include <sys/statvfs.h>
-
-+#include <glib/gprintf.h> /* g_print */
- #include "recorder_engine.h"
- 
- #define LOG_ERROR printf
-@@ -168,6 +169,8 @@ static RecorderMessage latest_message = MESSAGE_NULL;
- 
- static volatile sig_atomic_t quit_flag = 0;
- 
-+static void post_message (RecorderMessage message);
-+
- static void signal_handler(int signum)
- {
-   quit_flag = 1;
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch
deleted file mode 100644
index 292ab63f5..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 141f8f692ae2c7e6d41a2d78113c806602122ad5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:51:27 -0700
-Subject: [PATCH 04/10] gstimxcommon: Return 0 instead of NULL for a functions
- returning unsigned long
-Fixes
-gstimxcommon.c:113:10: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'unsigned long' [-Wint-conversion]
-  return NULL;
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/gstimxcommon.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c
-index 27fd913..803c6e5 100644
--- a/libs/gstimxcommon.c
-+++ b/libs/gstimxcommon.c
-@@ -35,13 +35,13 @@ unsigned long phy_addr_from_fd(int dmafd)
-   int ret, fd;
- 
-   if (dmafd < 0)
-    return NULL;
-+    return 0;
-   
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- #ifdef USE_ION
-   fd = open(dev_ion, O_RDWR);
-   if(fd < 0) {
-    return NULL;
-+    return 0;
-   }
- 
-   struct ion_phys_dma_data data = {
-@@ -58,18 +58,18 @@ unsigned long phy_addr_from_fd(int dmafd)
-   ret = ioctl(fd, ION_IOC_CUSTOM, &custom);
-   close(fd);
-   if (ret < 0)
-    return NULL;
-+    return 0;
- 
-   return data.phys;
- #else
-  return NULL;
-+  return 0;
- #endif /* USE_ION */
- #else
-   struct dma_buf_phys dma_phys;
- 
-   ret = ioctl(dmafd, DMA_BUF_IOCTL_PHYS, &dma_phys);
-   if (ret < 0)
-    return NULL;
-+    return 0;
- 
-   return dma_phys.phys;
- #endif
-@@ -86,7 +86,7 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-   fd = open(dev_ion, O_RDWR);
-   if(fd < 0) {
-    return NULL;
-+    return 0;
-   }
- 
-   struct ion_phys_virt_data data = {
-@@ -103,13 +103,13 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size)
-   ret = ioctl(fd, ION_IOC_CUSTOM, &custom);
-   close(fd);
-   if (ret < 0)
-    return NULL;
-+    return 0;
- 
-   return data.phys;
- #else
-  return NULL;
-+  return 0;
- #endif
- #else
-  return NULL;
-+  return 0;
- #endif
- }
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch
deleted file mode 100644
index 5f67ba1b0..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 379b0492a4b53fd8fd42c734d04fd62df2e0465f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:16:48 -0700
-Subject: [PATCH 05/10] aiurstreamcache: Include gst/gstinfo.h
-Its needed for various GST_* defines
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiurstreamcache.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/plugins/aiurdemux/aiurstreamcache.c b/plugins/aiurdemux/aiurstreamcache.c
-index d566268..e114a9d 100755
--- a/plugins/aiurdemux/aiurstreamcache.c
-+++ b/plugins/aiurdemux/aiurstreamcache.c
-@@ -33,6 +33,7 @@
-  * Changelog:
-  *
-  */
-+ #include <gst/gstinfo.h>
- 
- GST_DEBUG_CATEGORY_EXTERN (aiurdemux_debug);
- #define GST_CAT_DEFAULT aiurdemux_debug
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch
deleted file mode 100644
index ae3d10618..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 02e16c4de3f138f0ebabf699e840bb86c98be599 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 20:45:23 -0700
-Subject: [PATCH 06/10] Fix typecast warnings found with clang
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/device-2d/imx_2d_device_g2d.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-diff --git a/libs/device-2d/imx_2d_device_g2d.c b/libs/device-2d/imx_2d_device_g2d.c
-index 2672e0b..6a36f6a 100755
--- a/libs/device-2d/imx_2d_device_g2d.c
-+++ b/libs/device-2d/imx_2d_device_g2d.c
-@@ -425,7 +425,7 @@ static gint imx_g2d_blit(Imx2DDevice *device,
-       goto err;
-     }
-     if (paddr) {
-      src->mem->paddr = paddr;
-+      src->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       ret = -1;
-@@ -435,7 +435,7 @@ static gint imx_g2d_blit(Imx2DDevice *device,
-   if (!dst->mem->paddr) {
-     paddr = phy_addr_from_fd (dst->fd[0]);
-     if (paddr) {
-      dst->mem->paddr = paddr;
-+      dst->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       ret = -1;
-@@ -474,10 +474,11 @@ static gint imx_g2d_blit(Imx2DDevice *device,
- 
-   if (src->fd[1] >= 0)
-   {
-    if (!src->mem->user_data)
-      src->mem->user_data = g2d->src.base.planes[1] = phy_addr_from_fd (src->fd[1]);
-    else
-      g2d->src.base.planes[1] = src->mem->user_data;
-+    if (!src->mem->user_data) {
-+      g2d->src.base.planes[1] = (gint)phy_addr_from_fd (src->fd[1]);
-+      src->mem->user_data = (gpointer *)g2d->src.base.planes[1];
-+    } else
-+      g2d->src.base.planes[1] = (unsigned long)src->mem->user_data;
-   }
-   switch (src->interlace_type) {
-     case IMX_2D_INTERLACE_INTERLEAVED:
-@@ -693,7 +694,7 @@ static gint imx_g2d_fill_color(Imx2DDevice *device, Imx2DFrame *dst,
-   if (!dst->mem->paddr) {
-     paddr = phy_addr_from_fd (dst->fd[0]);
-     if (paddr) {
-      dst->mem->paddr = paddr;
-+      dst->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       return -1;
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch
deleted file mode 100644
index 1983838af..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a1a2069403e227d4d40fc99257d1be077f65bdc8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:54:18 -0700
-Subject: [PATCH 07/10] gstimxv4l2: Fix typecasting errors
-Fixes
-gstimxv4l2.c:1702:22: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-conversion]
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/v4l2_core/gstimxv4l2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c
-index 1dc826b..bf2620a 100755
--- a/libs/v4l2_core/gstimxv4l2.c
-+++ b/libs/v4l2_core/gstimxv4l2.c
-@@ -1699,7 +1699,7 @@ gint gst_imx_v4l2_register_buffer (gpointer v4l2handle, PhyMemBlock *memblk)
-   v4l2buf->type = handle->type;
-   v4l2buf->memory = handle->memory_mode;
-   v4l2buf->index = handle->allocated;
-  v4l2buf->m.userptr = memblk->paddr;
-+  v4l2buf->m.userptr = (unsigned long)memblk->paddr;
-   v4l2buf->length = memblk->size;
-   handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr;
- 
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch
deleted file mode 100644
index 211bade10..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e86c20fee52f79a270a1913c5f0be98fb3f5cb77 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:18:18 -0700
-Subject: [PATCH 08/10] beepdec: Declare beep_register_external_typefinders
-Fixes
-plugins/beepdec/beep.c:45:3: error: call to undeclared function 'beep_register_external_typefinders'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-  beep_register_external_typefinders (plugin);
-  ^
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/beepdec/beep.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/plugins/beepdec/beep.c b/plugins/beepdec/beep.c
-index 3543352..e174bb3 100755
--- a/plugins/beepdec/beep.c
-+++ b/plugins/beepdec/beep.c
-@@ -37,7 +37,7 @@
- #endif
- #include "beepdec.h"
- #include "gstimxcommon.h"
-
-+extern gboolean beep_register_external_typefinders (GstPlugin * plugin);
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch
deleted file mode 100644
index 567d10267..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8a3d7f26c73bdfe050d3331b30ae2f5917dc6723 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:59:22 -0700
-Subject: [PATCH 09/10] gstimxv4l2.c: Fix incompatible integer to pointer
- conversion returning
-Fixes
-gstimxv4l2.c:1587:24: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-c
-onversion]
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/v4l2_core/gstimxv4l2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c
-index bf2620a..0fd7452 100755
--- a/libs/v4l2_core/gstimxv4l2.c
-+++ b/libs/v4l2_core/gstimxv4l2.c
-@@ -1576,7 +1576,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk)
- 
-     if (handle->allocated >= MAX_BUFFER) {
-       GST_ERROR ("No more v4l2 buffer for allocating.\n");
-      return -1;
-+      return NULL;
-     }
- 
-     v4l2buf = &handle->buffer_pair[handle->allocated].v4l2buffer;
-@@ -1584,7 +1584,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk)
-     v4l2buf->type = handle->type;
-     v4l2buf->memory = handle->memory_mode;
-     v4l2buf->index = handle->allocated;
-    v4l2buf->m.userptr = memblk->paddr;
-+    v4l2buf->m.userptr = (unsigned long)memblk->paddr;
-     v4l2buf->length = memblk->size;
-     handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr;
- 
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch
deleted file mode 100644
index e9b1a0938..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2144da90e64547d9e346f8e721a0d2155ed610b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 21:09:49 -0700
-Subject: [PATCH 10/10] provide declaration for
- aiur_register_external_typefinders
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiur.c | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/plugins/aiurdemux/aiur.c b/plugins/aiurdemux/aiur.c
-index 2a52465..681ae2e 100755
--- a/plugins/aiurdemux/aiur.c
-+++ b/plugins/aiurdemux/aiur.c
-@@ -41,6 +41,8 @@
- #include "aiurdemux.h"
- #include "gstimxcommon.h"
- 
-+extern gboolean aiur_register_external_typefinders (GstPlugin * plugin);
-+
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
deleted file mode 100644
index 5a58a5a67..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bda3461b0b6493f3e04910e82e6e530a64af26b1 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Mon, 24 Jul 2023 12:09:34 -0700
-Subject: [PATCH] meson: Undef _TIME_BITS along with _FILE_OFFSET_BITS
-On gcc 13, _TIME_BITS is set to 64 and causes failure with the undef of
-_FILE_OFFSET_BITS:
-```
-/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-   26 | #   error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-      |     ^~~~~
-```
-Upstream-Status: Pending
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/meson.build b/meson.build
-index 7ec5c70..64b2930 100644
--- a/meson.build
-+++ b/meson.build
-@@ -24,6 +24,7 @@ gst_dep = dependency('gstreamer-' + api_version, version : gst_req)
- #meson automaticaly add _FILE_OFFSET_BITS=64 to gcc, this will make ipu test
- #case fail when do mmap on 6q, autoconf didn't add this define, so undef it
- add_project_arguments('-U_FILE_OFFSET_BITS', language: 'c')
-+add_project_arguments('-U_TIME_BITS', language: 'c')
- 
- #below two marcos are defined in autoconf
- add_project_arguments ('-DARM', language: 'c')
-- 
-2.25.1
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index a13cf30ab..d7ac9b474 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -24,7 +24,9 @@ DEPENDS:append:imxvpu = " imx-vpuwrap"
 DEPENDS:append:imxfbdev:imxgpu = " libdrm"
 DEPENDS_IMXGPU        = ""
 DEPENDS_IMXGPU:imxgpu = "${DEPENDS_IMX_OPENCL_CONVERTER}"
-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"
@@ -34,25 +36,11 @@ RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
-PV = "4.8.3+git${SRCPV}"
+PV = "4.9.3+git${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
-           file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
-           file://0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch \
+SRCREV = "370510ef8137874339df18a2a35ec1d04d98fa0b"
-           file://0003-grecorder-Fix-build-with-clang.patch \
-           file://0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch \
-           file://0005-aiurstreamcache-Include-gst-gstinfo.h.patch \
-           file://0006-Fix-typecast-warnings-found-with-clang.patch \
-           file://0007-gstimxv4l2-Fix-typecasting-errors.patch \
-           file://0008-beepdec-Declare-beep_register_external_typefinders.patch \
-           file://0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch \
-           file://0010-provide-declaration-for-aiur_register_external_typef.patch \
-           file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \
-           "
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
-SRCREV = "91c7fec888cf8932c91e354331aad94975cae3ff"
-S = "${WORKDIR}/git"
 inherit meson pkgconfig use-imx-headers
@@ -61,13 +49,11 @@ PLATFORM:mx6sl-nxp-bsp = "MX6SL"
 PLATFORM:mx6sx-nxp-bsp = "MX6SX"
 PLATFORM:mx6ul-nxp-bsp = "MX6UL"
 PLATFORM:mx6sll-nxp-bsp = "MX6SLL"
-PLATFORM:mx7-nxp-bsp= "MX7D"
+PLATFORM:mx7-nxp-bsp = "MX7D"
-PLATFORM:mx7ulp-nxp-bsp= "MX7ULP"
+PLATFORM:mx7ulp-nxp-bsp = "MX7ULP"
 PLATFORM:mx8-nxp-bsp = "MX8"
 PLATFORM:mx9-nxp-bsp = "MX9"
-CFLAGS:append:toolchain-clang = " -Wno-implicit-int -Wno-int-conversion -Wno-incompatible-function-pointer-types"
 # Todo add a mechanism to map possible build targets
 EXTRA_OEMESON = "-Dplatform=${PLATFORM} \
                 -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb b/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb
index 0a2c71e76..5e42e6928 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.9.3.bb
@@ -1,21 +1,24 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017 NXP-2023
+# Copyright (C) 2017-2024 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=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 # Backward compatibility
 PROVIDES += "libfslcodec"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "7ae1615aad2c0456b9be2ab804a6267e"
+SRC_URI[sha256sum] = "61b40623e1c2322f1ba85da57ab6949f749d02b3b5cbc2b1ef583a99b59e8968"
-SRC_URI[sha256sum] = "9facb3541903b4a6c6baa906f8c2c6cc01fc8c7b82a726c8da6d3681d4ed720b"
+IMX_SRCREV_ABBREV = "394336b"
 inherit fsl-eula-unpack autotools pkgconfig
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 PACKAGECONFIG ??= "${PACKAGECONFIG_VPU}"
 # Support Chips&Media VPU only
 PACKAGECONFIG_VPU               = ""
@@ -60,7 +63,7 @@ do_package_qa[prefuncs] += "__set_insane_skip"
 python __split_libfslcodec_plugins() {
    codecdir = bb.data.expand('${libdir}', d)
-    do_split_packages(d, codecdir, '^lib_([^_]*).*_arm.*_elinux\.so\..*',
+    do_split_packages(d, codecdir, r'^lib_([^_]*).*_arm.*_elinux\.so\..*',
                      aux_files_pattern='${libdir}/imx-mm/audio-codec/wrap/lib_%sd_wrap_arm*_elinux.so.*',
                      output_pattern='imx-codec-%s',
                      description='Freescale i.MX Codec (%s)',
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
index bc73bd9f9..d9986456a 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
@@ -2,14 +2,13 @@
 DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 inherit fsl-eula-unpack autotools pkgconfig
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "32251bc952ca7b9a4b12fadb9328a8c1"
+SRC_URI[sha256sum] = "fa30f3e1b13e570d7c6f0a5f335c11fc3c6336a266fd3a4941e27c4c2a5b13d3"
-SRC_URI[sha256sum] = "0baa82410a77c68e39aaa987d91b41c94255d62294fa2f5a399169f3068862cc"
 EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp"
 EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
index 60761e6e1..96656f85b 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
@@ -1,16 +1,17 @@
-# Copyright 2017-2023 NXP
+# Copyright 2017-2022,2024 NXP
 DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 inherit fsl-eula-unpack autotools pkgconfig
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "ea4fe3f"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[md5sum] = "199f88716f289e93e0954fa6475a3cbc"
+SRC_URI[sha256sum] = "fc6e6a7c2417730b39eeddc26606c3d58a8f5d0a1521f44bbbd505657046858b"
-SRC_URI[sha256sum] = "83eaef592de33b4d5e8fae63d798cc955bf3c414911c87afeb65a20af01fb0b6"
 EXTRA_OECONF = " \
    -datadir=${base_libdir}/firmware \
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
index 48be837a9..9655b1f7d 100644
--- 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
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72c0f70181bb6e83eee6aab8de12a9f3"
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "d46005ee29ca603caa2e1b1e82953ff1"
 SRC_URI[sha256sum] = "e79cbf4788a86a0068bbe80c37317e3332ae76e3d5c3ff2eabd71f03121fab6a"
 inherit fsl-eula-unpack autotools pkgconfig
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb
deleted file mode 100644
index 3dc0a7ea5..000000000
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2023 NXP
-DESCRIPTION = "NXP Multimedia opencl converter lib"
-LICENSE = "Proprietary"
-SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-DEPENDS = "opencl-headers"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "dc668682189ce740fb46073e62f58066"
-SRC_URI[sha256sum] = "9f283df500c57421b87d96d9af7022ab490bc241aa28d00755beaadabbcd754b"
-inherit fsl-eula-unpack autotools pkgconfig meson
-FILES:${PN} += "${datadir}/"
-COMPATIBLE_MACHINE               = "(^$)"
-COMPATIBLE_MACHINE:imxgpu        = "(mx8-nxp-bsp|mx95-nxp-bsp)"
-COMPATIBLE_MACHINE:mx8mm-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.7.0.bb
new file mode 100644
index 000000000..84f3ee6aa
--- /dev/null
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb
@@ -0,0 +1,20 @@
+# Copyright 2023-2024 NXP
+DESCRIPTION = "NXP Multimedia opencl converter lib"
+LICENSE = "Proprietary"
+SECTION = "multimedia"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+DEPENDS = "virtual/opencl-icd"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "ad0094a"
+SRC_URI[sha256sum] = "d23ad4234f34ffcfb37d77c91345b935894937913a68995223d2f9f421eade46"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack autotools pkgconfig meson
+FILES:${PN} += "${datadir}/"
+COMPATIBLE_MACHINE               = "(^$)"
+COMPATIBLE_MACHINE:imxgpu        = "(mx8-nxp-bsp|mx95-nxp-bsp)"
+COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)"
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb
index 4e580085f..d770b66ea 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -13,9 +13,11 @@ RREPLACES:${PN} = "libfslparser"
 RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "9bca484287f5592b86ed10c1761a3fcc"
+IMX_SRCREV_ABBREV = "c296eb2"
-SRC_URI[sha256sum] = "b25267eefb4618b2ba8d6aba46a5b4e09621a44115036fc896e0777006472043"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+SRC_URI[sha256sum] = "997a7f79f291ef4b3c8dd3ba6f2f32c430c63feb4bb29d923f71da0d1ccf20a9"
 inherit fsl-eula-unpack autotools pkgconfig
diff --git a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
index 2b62b2443..68919ac83 100644
--- a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
+++ b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
@@ -6,7 +6,6 @@ SECTION = "multimedia"
 LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "cbd5af6e9019db789c03c2d05a8bb444"
 SRC_URI[sha256sum] = "f778a7b785fc500df5573f5b810a190ddc561267b47ca54b9ddf4ae12571cfe3"
 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
new file mode 100644
index 000000000..74ea5206c
--- /dev/null
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch
@@ -0,0 +1,32 @@
+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 af15e7b1b..39729f712 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -1,23 +1,26 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright (C) 2017-2023 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=2827219e81f28aba7c6a569f7c437fa7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
-SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = " \
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+    git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH} \
-SRCREV = "f974cecdb00b4a214e4b5229f2279e772ee43306"
+    file://0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch \
+"
-S = "${WORKDIR}/git"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+SRCREV = "d8703ee3245797111ad21c52982efa8b6db33241"
 inherit autotools pkgconfig
+CFLAGS += " -Wno-error=implicit-function-declaration"
 do_install:append() {
    # FIXME: Drop examples for now
    rm -r ${D}${datadir}
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
index 1e7d8252c..cce4e56ad 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
@@ -11,12 +11,10 @@ DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 PV .= "+git${SRCPV}"
 SRCBRANCH ?= "master"
-SRCREV = "6f803f46d6b53a08cf02fc3d440072e01e2f3a09"
+SRCREV = "37095a854aa176bb763a25ce98ceb6a787501271"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
+inherit waf pkgconfig use-imx-headers python3native
-inherit waf pkgconfig use-imx-headers
 IMX_PLATFORM:mx6-nxp-bsp = "imx6"
 IMX_PLATFORM:mx8mq-nxp-bsp = "imx8m"
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
index e3a051937..55063db18 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
@@ -12,9 +12,7 @@ SRCBRANCH ?= "v1"
 SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
+inherit waf pkgconfig python3native
-inherit waf pkgconfig
 COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)"
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 93f71e8f6..6e4db9110 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -17,9 +17,9 @@ SRC_URI_IMX:mx9-nxp-bsp = " \
 CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
 do_install:append() {
-    if [ -e "${WORKDIR}/daemon.conf" ] && [ -e "${WORKDIR}/default.pa" ]; then
+    if [ -e "${UNPACKDIR}/daemon.conf" ] && [ -e "${UNPACKDIR}/default.pa" ]; then
-        install -m 0644 ${WORKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
+        install -m 0644 ${UNPACKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
-        install -m 0644 ${WORKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
+        install -m 0644 ${UNPACKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
    fi
 }
diff --git a/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch b/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch
deleted file mode 100755
index 78ff6989c..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch
+++ /dev/null
@@ -1,1002 +0,0 @@
-From 16f6b7a5baec41f18fde75fd311fb988e3c31810 Mon Sep 17 00:00:00 2001
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-Date: Fri, 13 Jul 2018 18:13:24 +0800
-Subject: [PATCH] tinycompress: Add id3 decoding
-Upstream-Status: Pending
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
- include/tinycompress/id3_tag_decode.h | 198 +++++++++++
- src/utils/Makefile.am                 |   2 +-
- src/utils/cplay.c                     |  88 +++++
- src/utils/id3_tag_decode.c            | 642 ++++++++++++++++++++++++++++++++++
- 4 files changed, 929 insertions(+), 1 deletion(-)
- create mode 100644 include/tinycompress/id3_tag_decode.h
- create mode 100644 src/utils/id3_tag_decode.c
-diff --git a/include/tinycompress/id3_tag_decode.h b/include/tinycompress/id3_tag_decode.h
-new file mode 100644
-index 0000000..1a911d7
--- /dev/null
-+++ b/include/tinycompress/id3_tag_decode.h
-@@ -0,0 +1,198 @@
-+/*
-+ * Copyright (c) 2006-2017 Cadence Design Systems, Inc.
-+ * Copyright 2018 NXP
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/******************************************************************
-+ *  file name       : id3_tag_decode.h
-+ *
-+ *  description     : stores typedefs of structures specific to MP3 tag
-+ *
-+ *  revision history:
-+ *       29 04 2004       DK     creation
-+ *****************************************************************/
-+
-+#ifndef ID3_TAG_DECODE_H
-+#define ID3_TAG_DECODE_H
-+
-+typedef signed char             WORD8;
-+typedef signed char *           pWORD8;
-+typedef unsigned char           UWORD8;
-+typedef unsigned char *         pUWORD8;
-+
-+typedef signed short            WORD16;
-+typedef signed short *          pWORD16;
-+typedef unsigned short          UWORD16;
-+typedef unsigned short *        pUWORD16;
-+
-+typedef signed int              WORD24;
-+typedef signed int *            pWORD24;
-+typedef unsigned int            UWORD24;
-+typedef unsigned int *          pUWORD24;
-+
-+typedef signed int              WORD32;
-+typedef signed int *            pWORD32;
-+typedef unsigned int            UWORD32;
-+typedef unsigned int *          pUWORD32;
-+
-+typedef void                    VOID;
-+typedef void *                  pVOID;
-+
-+typedef signed int              BOOL;
-+typedef unsigned int            UBOOL;
-+typedef signed int              FLAG;
-+typedef unsigned int            UFLAG;
-+typedef signed int              LOOPIDX;
-+typedef unsigned int            ULOOPIDX;
-+typedef signed int              WORD;
-+typedef unsigned int            UWORD;
-+
-+#define MAX_TAG_FRAME_SIZE             100
-+
-+#define ID3V1          (0x544147)      /* 0x544147 is TAG in WORD8 */
-+
-+#define ID3V2          (0x494433)      /* 0x494433 is ID3 in WORD8 */
-+
-+/*
-+ * structure corresponding to ID3 tag v1 header.
-+ * this structure has all the field corresponding to ID3 tag v1 header.
-+ */
-+
-+typedef struct {
-+       WORD32 tag;                             // 3 bytes
-+
-+       WORD16 version;                 // 2 bytes
-+
-+       WORD8 flag;                             //1 byte
-+
-+       WORD32  size;           //4 bytes
-+
-+} id3_v2_header_struct;
-+
-+/* structure which will store the frame data and
-+ * also put a limit max data to be stored
-+ */
-+typedef struct {
-+       WORD8 frame_data[MAX_TAG_FRAME_SIZE];
-+
-+       WORD32  max_size;               //4 bytes
-+
-+       WORD16 tag_present;
-+
-+       WORD16 exceeds_buffer_size;
-+
-+} id3_v2_frame_struct;
-+
-+/*
-+ * structure corresponding to ID3 tag v2.
-+ * this structure has some of the  field corresponding to ID3 tag v2.
-+ * if user wants to read some more tag information from
-+ * the MP3 file, he can add that field in this structure and pass address
-+ * of that element to get_inf function in id3_tag_decode.c under the
-+ * corresponding field frame header. few fields which are needed are already
-+ * populated by reading from the TAG header.
-+ */
-+typedef struct {
-+       id3_v2_frame_struct  album_movie_show_title;
-+
-+       id3_v2_frame_struct  composer_name;
-+
-+       id3_v2_frame_struct  content_type;
-+
-+       id3_v2_frame_struct  encoded_by;
-+
-+       id3_v2_frame_struct  lyricist_text_writer;
-+
-+       id3_v2_frame_struct  content_group_description;
-+
-+       id3_v2_frame_struct  title_songname_content_description;
-+
-+       id3_v2_frame_struct  medxa_type;
-+
-+       id3_v2_frame_struct  original_album_movie_show_title;
-+
-+       id3_v2_frame_struct  original_filename;
-+
-+       id3_v2_frame_struct  original_lyricist_text_writer;
-+
-+       id3_v2_frame_struct  original_artist_performer;
-+
-+       id3_v2_frame_struct  file_owner_licensee;
-+
-+       id3_v2_frame_struct  lead_performer_soloist;
-+
-+       id3_v2_frame_struct  publisher;
-+
-+       id3_v2_frame_struct  private_frame;
-+
-+       id3_v2_frame_struct  other_info;
-+
-+       id3_v2_header_struct id3_v2_header;
-+
-+       WORD32 header_end;
-+
-+       WORD32 bytes_consumed;
-+
-+} id3v2_struct;
-+
-+/*
-+ * structure corresponding to ID3 tag v1.
-+ * this structure has all the field corresponding to ID3 tag v1.
-+ */
-+typedef struct {
-+       WORD8 song_title[30]; //30 word8acters
-+
-+       WORD8 artist[30]; //30 word8acters
-+
-+       WORD8 album[30]; //30 word8acters
-+
-+       WORD8 year[4]; //4 word8acters
-+
-+       WORD8 comment[30]; //30 word8acters
-+
-+       WORD8 genre[1]; //1 byte
-+
-+} id3v1_struct;
-+
-+WORD32 get_info(const char *inp_buffer,
-+               unsigned int         avail_inp,
-+               WORD32               tag_size,
-+               id3_v2_frame_struct *dest);
-+
-+WORD32 search_id3_v2(UWORD8 *buffer);
-+
-+WORD32 decode_id3_v2(const char *const buffer,
-+                    id3v2_struct *id3v2,
-+                    WORD32        continue_flag,
-+                    WORD32        insize);
-+
-+WORD32 get_id3_v2_bytes(UWORD8 *buffer);
-+
-+WORD32 get_v1_info(UWORD8 *buffer, id3v1_struct *id3v1);
-+
-+WORD32 search_id3_v1(UWORD8 *buffer);
-+
-+WORD32 decode_id3_v1(UWORD8 *buffer, id3v1_struct *id3v1);
-+
-+void init_id3v2_field(id3v2_struct *id3v2);
-+
-+#endif
-diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
-index 1b996d4..e813689 100644
--- a/src/utils/Makefile.am
-+++ b/src/utils/Makefile.am
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = cplay crecord
- 
-cplay_SOURCES = cplay.c
-+cplay_SOURCES = cplay.c id3_tag_decode.c
- crecord_SOURCES = crecord.c
- 
- cplay_CFLAGS = -I$(top_srcdir)/include
-diff --git a/src/utils/cplay.c b/src/utils/cplay.c
-index 87863a3..2a52b52 100644
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -72,6 +72,7 @@
- #include "sound/compress_params.h"
- #include "tinycompress/tinycompress.h"
- #include "tinycompress/tinymp3.h"
-+#include "tinycompress/id3_tag_decode.h"
- 
- static int verbose;
- static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM;
-@@ -245,12 +246,97 @@ int main(int argc, char **argv)
-        exit(EXIT_SUCCESS);
- }
- 
-+void shift_buffer(char *buf, int buf_size, int bytes_consumed)
-+{
-+       int i;
-+
-+       if (bytes_consumed <= 0)
-+               return;
-+
-+       for (i = 0; i < buf_size - bytes_consumed; i++)
-+               buf[i] = buf[i + bytes_consumed];
-+}
-+
-+void parse_id3(FILE *file, int *offset) {
-+       /* ID3 tag specific declarations */
-+       unsigned char id3_buf[128];
-+       unsigned char id3v2_buf[4096];
-+       signed int id3_v1_found = 0, id3_v1_decoded = 0;
-+       signed int id3_v2_found = 0, id3_v2_complete = 0;
-+       signed int i_bytes_consumed = 0;
-+       signed int i_fread_bytes;
-+       id3v1_struct id3v1;
-+       id3v2_struct id3v2;
-+
-+       {
-+               fseek(file, -128, SEEK_END);
-+               fread(id3_buf, 1, 128, file);
-+
-+               /* search for ID3V1 */
-+               id3_v1_found = search_id3_v1(id3_buf + 0);
-+               if (id3_v1_found) {
-+                       /* if ID3V1 is found, decode ID3V1 */
-+                       decode_id3_v1(id3_buf + 3, &id3v1);
-+                       id3_v1_decoded = 1;
-+               }
-+               fseek(file, 0, SEEK_SET);
-+       }
-+
-+       {
-+               signed int flag = 0;
-+               signed int continue_flag = 0;
-+
-+               i_fread_bytes = fread(id3v2_buf,
-+                               sizeof(char), 0x1000, file);
-+
-+               /* search for ID3V2 */
-+               id3_v2_found =
-+                       search_id3_v2(id3v2_buf);
-+
-+               if (id3_v2_found) {
-+                       /* initialise the max fields */
-+                       init_id3v2_field(&id3v2);
-+
-+                       while (!id3_v2_complete && id3_v2_found) {
-+                               /* if ID3V2 is found, decode ID3V2 */
-+                               id3_v2_complete = decode_id3_v2((const char *const)id3v2_buf,
-+                                                       &id3v2, continue_flag, i_fread_bytes);
-+
-+                               if (!id3_v2_complete) {
-+                                       continue_flag = 1;
-+                                       i_bytes_consumed = id3v2.bytes_consumed;
-+
-+                                       fseek(file, i_bytes_consumed, SEEK_SET);
-+
-+                                        i_fread_bytes = fread(id3v2_buf,
-+                                                              sizeof(unsigned char), 0x1000, file);
-+                                        if (i_fread_bytes <= 0) {
-+                                               return;
-+                                        }
-+                               }
-+                       }
-+
-+                       if (id3_v2_complete) {
-+                               i_bytes_consumed = id3v2.bytes_consumed;
-+                               fseek(file, i_bytes_consumed, SEEK_SET);
-+                        }
-+                }
-+       }
-+
-+       *offset = i_bytes_consumed;
-+}
-+
- void get_codec_mp3(FILE *file, struct compr_config *config,
-                struct snd_codec *codec)
- {
-        size_t read;
-        struct mp3_header header;
-        unsigned int channels, rate, bits;
-+       int offset = 0;
-+
-+       parse_id3(file, &offset);
-+
-+       fseek(file, offset, SEEK_SET);
- 
-        read = fread(&header, 1, sizeof(header), file);
-        if (read != sizeof(header)) {
-@@ -279,6 +365,8 @@ void get_codec_mp3(FILE *file, struct compr_config *config,
-        codec->level = 0;
-        codec->ch_mode = 0;
-        codec->format = 0;
-+
-+       fseek(file, offset, SEEK_SET);
- }
- 
- void get_codec_iec(FILE *file, struct compr_config *config,
-diff --git a/src/utils/id3_tag_decode.c b/src/utils/id3_tag_decode.c
-new file mode 100644
-index 0000000..393967a
--- /dev/null
-+++ b/src/utils/id3_tag_decode.c
-@@ -0,0 +1,642 @@
-+/*
-+ * Copyright (c) 2006-2017 Cadence Design Systems, Inc.
-+ * Copyright 2018 NXP
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+#include <ctype.h>
-+#include "tinycompress/id3_tag_decode.h"
-+
-+#define CHAR4(c1, c2, c3, c4) \
-+       (int)(((unsigned char)(c1) << 24) | \
-+               ((unsigned char)(c2) << 16) | \
-+               ((unsigned char)(c3) << 8) | \
-+               ((unsigned char)c4))
-+
-+#ifndef MSVC_BUILD
-+unsigned int umin(unsigned int a, unsigned int b)
-+{
-+       return (a < b ? a : b);
-+}
-+
-+#else
-+unsigned int umin(unsigned int a, unsigned int b)
-+{
-+       return (a < b ? a : b);
-+}
-+#endif
-+
-+/***********************************************************
-+ *  function name   : display
-+ *
-+ *  description     : display ID3 tag contents.
-+ *
-+ *  arguments       : input parameters
-+ *
-+ *  values returned : 0
-+ ***********************************************************/
-+
-+static void display2(const id3_v2_frame_struct * const src,
-+                    int size,
-+                    const char * const disp)
-+{
-+       int j;
-+
-+
-+       for (j = 0; j < size; j++) {
-+               int c = src->frame_data[j];
-+
-+               if (c) {
-+                       if (!isprint(c))
-+                               break;
-+               }
-+       }
-+}
-+
-+static VOID display1(WORD8 src[], WORD32 size, WORD8 disp[])
-+{
-+       WORD32 j;
-+
-+       for (j = 0; j < size ; j++) {
-+               int c = src[j];
-+
-+               if (c) {
-+                       if (!isprint(c))
-+                               break;
-+               }
-+       }
-+}
-+
-+/*****************************************************************
-+ *  function name   : init_id3_header
-+ *
-+ *  description     : initialise the max filed size of teh farem.
-+ *
-+ *  arguments       : input parameters
-+ *
-+ *  values returned : 0
-+ ****************************************************************/
-+
-+VOID init_id3v2_field(id3v2_struct *id3v2)
-+{
-+       id3v2->album_movie_show_title.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->composer_name.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->content_type.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->encoded_by.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->lyricist_text_writer.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->content_group_description.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->title_songname_content_description.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->medxa_type.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_album_movie_show_title.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_filename.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_lyricist_text_writer.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_artist_performer.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->file_owner_licensee.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->lead_performer_soloist.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->publisher.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->private_frame.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->other_info.max_size = MAX_TAG_FRAME_SIZE;
-+
-+       /* resetting the flag to indicate presese of frame */
-+       id3v2->album_movie_show_title.tag_present = 0;
-+       id3v2->composer_name.tag_present = 0;
-+       id3v2->content_type.tag_present = 0;
-+       id3v2->encoded_by.tag_present = 0;
-+       id3v2->lyricist_text_writer.tag_present = 0;
-+       id3v2->content_group_description.tag_present = 0;
-+       id3v2->title_songname_content_description.tag_present = 0;
-+       id3v2->medxa_type.tag_present = 0;
-+       id3v2->original_album_movie_show_title.tag_present = 0;
-+       id3v2->original_filename.tag_present = 0;
-+       id3v2->original_lyricist_text_writer.tag_present = 0;
-+       id3v2->original_artist_performer.tag_present = 0;
-+       id3v2->file_owner_licensee.tag_present = 0;
-+       id3v2->lead_performer_soloist.tag_present = 0;
-+       id3v2->publisher.tag_present = 0;
-+       id3v2->private_frame.tag_present = 0;
-+       id3v2->other_info.tag_present = 0;
-+
-+       /* resetting the flag which indicates that size of the frame has
-+        * exceeded the max buffer size
-+        */
-+       id3v2->album_movie_show_title.exceeds_buffer_size = 0;
-+       id3v2->composer_name.exceeds_buffer_size = 0;
-+       id3v2->content_type.exceeds_buffer_size = 0;
-+       id3v2->encoded_by.exceeds_buffer_size = 0;
-+       id3v2->lyricist_text_writer.exceeds_buffer_size = 0;
-+       id3v2->content_group_description.exceeds_buffer_size = 0;
-+       id3v2->title_songname_content_description.exceeds_buffer_size = 0;
-+       id3v2->medxa_type.exceeds_buffer_size = 0;
-+       id3v2->original_album_movie_show_title.exceeds_buffer_size = 0;
-+       id3v2->original_filename.exceeds_buffer_size = 0;
-+       id3v2->original_lyricist_text_writer.exceeds_buffer_size = 0;
-+       id3v2->original_artist_performer.exceeds_buffer_size = 0;
-+       id3v2->file_owner_licensee.exceeds_buffer_size = 0;
-+       id3v2->lead_performer_soloist.exceeds_buffer_size = 0;
-+       id3v2->publisher.exceeds_buffer_size = 0;
-+       id3v2->private_frame.exceeds_buffer_size = 0;
-+       id3v2->other_info.exceeds_buffer_size = 0;
-+
-+       id3v2->bytes_consumed = 0;
-+       id3v2->header_end = 0;
-+}
-+
-+/***************************************************************
-+ *  function name   : search_id3_v2
-+ *
-+ *  description     : finds if ID3V2 starts at the start of given buffer.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer          input buffer
-+ *
-+ *  values returned : FLAG   1: ID3 found   0: ID3 not found
-+ ***************************************************************/
-+WORD32 search_id3_v2(UWORD8 *buffer)
-+{
-+       UWORD32 temp;
-+
-+       temp  = buffer[0] << 16;
-+       temp |= buffer[1] <<  8;
-+       temp |= buffer[2];
-+
-+       if (temp == ID3V2)
-+               return 1;   /* ID3 found */
-+
-+       return 0;       /* ID3 not found */
-+}
-+
-+/**************************************************************
-+ *  function name   : search_id3_v1
-+ *
-+ *  description     : finds if ID3V1 starts at the start of given buffer.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer          input buffer
-+ *
-+ *  values returned : FLAG   1: ID3 found   0: ID3 not found
-+ **************************************************************/
-+WORD32 search_id3_v1(UWORD8 *buffer)
-+{
-+       UWORD32 temp;
-+
-+       temp  = buffer[0] << 16;
-+       temp |= buffer[1] <<  8;
-+       temp |= buffer[2];
-+
-+       if (temp == ID3V1)
-+               return 1;   /* ID3 found */
-+
-+       return 0;       /* ID3 not found */
-+}
-+
-+/***************************************************************
-+ *  function name   : decode_id3_v1
-+ *
-+ *  description     : decodes ID3V1 tag.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer              input buffer
-+ *                   id3v1               structure
-+ *
-+ *  values returned : bytes consumed
-+ **************************************************************/
-+WORD32 decode_id3_v1(UWORD8 *buffer, id3v1_struct *id3v1)
-+{
-+       WORD32 bytes_consumed = 0;
-+       short tag_type;
-+
-+       /* setting the tag type */
-+       tag_type = 1;
-+
-+       bytes_consumed = get_v1_info(buffer, id3v1);
-+
-+       return bytes_consumed;
-+}
-+
-+/***********************************************************
-+ *  function name   : get_v1_info
-+ *
-+ *  description     : gets ID3V1 information fields.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer              input buffer
-+ *                   id3v1               structure
-+ *
-+ *  values returned : bytes consumed
-+ ***********************************************************/
-+WORD32 get_v1_info(UWORD8 *buffer, id3v1_struct *id3v1)
-+{
-+       WORD32 i;
-+       WORD32 bytes_consumed = 0;
-+
-+       /* get song_title */
-+       for (i = 0; i < 30; i++)
-+               id3v1->song_title[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->song_title, 30, (WORD8 *)"song_title : ");
-+
-+       /* get artist */
-+       for (i = 0; i < 30; i++)
-+               id3v1->artist[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->artist, 30, (WORD8 *)"artist : ");
-+
-+       /* get album */
-+       for (i = 0; i < 30; i++)
-+               id3v1->album[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->album, 30, (WORD8 *)"album : ");
-+
-+       /* get year */
-+       for (i = 0; i < 4; i++)
-+               id3v1->year[i] = buffer[i];
-+
-+       buffer += 4;
-+       bytes_consumed += 4;
-+       display1(id3v1->year, 4, (WORD8 *)"year : ");
-+
-+       /* get comment */
-+       for (i = 0; i < 30; i++)
-+               id3v1->comment[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->comment, 30, (WORD8 *)"comment : ");
-+
-+       /* get genre */
-+       for (i = 0; i < 1; i++)
-+               id3v1->genre[i] = buffer[i];
-+
-+       buffer += 1;
-+       bytes_consumed += 1;
-+
-+       return bytes_consumed;
-+}
-+
-+/*****************************************************
-+ *  function name   : decode_id3_v2
-+ *
-+ *  description     : decodes ID3V2 tag.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer              input buffer
-+ *                   id3v2               structure
-+ *                   continue_flag       FLAG to indicate whether
-+ *                                       it is first call or not
-+ *                   insize              input buffer size
-+ *
-+ *  values returned : bytes consumed
-+ ******************************************************/
-+WORD32 decode_id3_v2(const char *const buffer,
-+                    id3v2_struct *const id3v2,
-+                    WORD32  continue_flag,
-+                    WORD32  insize)
-+{
-+       UWORD32 size = 0, flag;
-+       WORD32 i, buf_update_val;
-+       UWORD8 buf[4], frame_header[10], id3_buffer[10];
-+       WORD8 *bitstream_ptr;
-+       short tag_type;
-+
-+       WORD32 bytes_consumed = 0;
-+
-+       if (id3v2->header_end == 1) {
-+               id3v2->bytes_consumed += insize;
-+               if (id3v2->bytes_consumed < id3v2->id3_v2_header.size)
-+                       return 0;
-+
-+               id3v2->bytes_consumed = (id3v2->id3_v2_header.size + 10);
-+               return 1;
-+       }
-+
-+       bitstream_ptr = (WORD8 *)id3_buffer;
-+
-+       if (!continue_flag) {
-+               bytes_consumed += 3;
-+               /* setting the tag type */
-+               tag_type = 2;
-+               id3v2->id3_v2_header.version  = buffer[bytes_consumed + 0] << 8;
-+               id3v2->id3_v2_header.version |= buffer[bytes_consumed + 1];
-+               id3v2->id3_v2_header.flag = buffer[bytes_consumed + 2];
-+
-+               /* making the msb of each byte zero */
-+               buf[0] = buffer[bytes_consumed + 6] & 0x7f;
-+               buf[1] = buffer[bytes_consumed + 5] & 0x7f;
-+               buf[2] = buffer[bytes_consumed + 4] & 0x7f;
-+               buf[3] = buffer[bytes_consumed + 3] & 0x7f;
-+
-+               bytes_consumed += 7;
-+
-+               /* concatenation the bytes after making
-+                * 7th bit zero to get 28 bits size
-+                */
-+               size  = buf[0];
-+               size |= (buf[1] << 7);
-+               size |= (buf[2] << 14);
-+               size |= (buf[3] << 21);
-+               /* storing the size */
-+               id3v2->id3_v2_header.size = size;
-+
-+               /* check for extended header */
-+               if (id3v2->id3_v2_header.flag & 0x20) {
-+                       for (i = 0; i < 10; i++)
-+                               bitstream_ptr[i] = buffer[bytes_consumed + i];
-+
-+                       i = 0;
-+                       bytes_consumed += 10;
-+
-+                       size = bitstream_ptr[i++]  << 24;
-+                       size |= bitstream_ptr[i++] << 16;
-+                       size |= bitstream_ptr[i++] << 8;
-+                       size |= bitstream_ptr[i++];
-+
-+                       /* two bytes for flag */
-+                       i += 2;
-+                       {
-+                               UWORD32 padding_size;
-+
-+                               padding_size   = bitstream_ptr[i++]  << 24;
-+                               padding_size   |= bitstream_ptr[i++] << 16;
-+                               padding_size   |= bitstream_ptr[i++] << 8;
-+                               padding_size   |= bitstream_ptr[i++];
-+
-+                               /* skipping the padding and frame size
-+                                * number of bytes
-+                                */
-+                               bytes_consumed += (padding_size + size);
-+                       }
-+               }
-+       }
-+
-+       while (id3v2->header_end != 1) {
-+               char *key;
-+               id3_v2_frame_struct *value;
-+               unsigned int avail_inp;
-+
-+               /* reading the 10 bytes to get the frame header */
-+
-+               for (i = 0; i < 10; i++)
-+                       frame_header[i] = buffer[bytes_consumed + i];
-+               bytes_consumed += 10;
-+
-+               /* getting the size from the header */
-+               size = frame_header[4]  << 24;
-+               size |= frame_header[5] << 16;
-+               size |= frame_header[6] << 8;
-+               size |= frame_header[7];
-+
-+               /* decoding the flag, currently not used */
-+               flag = frame_header[8] << 8;
-+               flag |= frame_header[9];
-+
-+               avail_inp = insize - bytes_consumed;
-+
-+               /* switching to the frame type */
-+               switch (CHAR4(frame_header[0],
-+                             frame_header[1],
-+                             frame_header[2],
-+                             frame_header[3])) {
-+               case CHAR4('A', 'E', 'N', 'C'):
-+               case CHAR4('A', 'P', 'I', 'C'):
-+               case CHAR4('C', 'O', 'M', 'M'):
-+               case CHAR4('C', 'O', 'M', 'R'):
-+               case CHAR4('E', 'N', 'C', 'R'):
-+               case CHAR4('E', 'Q', 'U', 'A'):
-+               case CHAR4('E', 'T', 'C', 'O'):
-+               case CHAR4('G', 'E', 'O', 'B'):
-+               case CHAR4('G', 'R', 'I', 'D'):
-+               case CHAR4('I', 'P', 'L', 'S'):
-+               case CHAR4('L', 'I', 'N', 'K'):
-+               case CHAR4('M', 'C', 'D', 'I'):
-+               case CHAR4('M', 'L', 'L', 'T'):
-+               case CHAR4('O', 'W', 'N', 'E'):
-+               case CHAR4('P', 'C', 'N', 'T'):
-+               case CHAR4('P', 'O', 'P', 'M'):
-+               case CHAR4('P', 'O', 'S', 'S'):
-+               case CHAR4('R', 'B', 'U', 'F'):
-+               case CHAR4('R', 'V', 'A', 'D'):
-+               case CHAR4('R', 'V', 'R', 'B'):
-+               case CHAR4('S', 'Y', 'L', 'T'):
-+               case CHAR4('S', 'Y', 'T', 'C'):
-+               case CHAR4('T', 'B', 'P', 'M'):
-+               case CHAR4('T', 'C', 'O', 'P'):
-+               case CHAR4('T', 'D', 'A', 'T'):
-+               case CHAR4('T', 'D', 'L', 'Y'):
-+               case CHAR4('T', 'F', 'L', 'T'):
-+               case CHAR4('T', 'I', 'M', 'E'):
-+               case CHAR4('T', 'K', 'E', 'Y'):
-+               case CHAR4('T', 'L', 'A', 'N'):
-+               case CHAR4('T', 'L', 'E', 'N'):
-+               case CHAR4('T', 'M', 'E', 'D'):
-+               case CHAR4('T', 'O', 'F', 'N'):
-+               case CHAR4('T', 'O', 'L', 'Y'):
-+               case CHAR4('T', 'O', 'R', 'Y'):
-+               case CHAR4('T', 'P', 'E', '2'):
-+               case CHAR4('T', 'P', 'E', '3'):
-+               case CHAR4('T', 'P', 'E', '4'):
-+               case CHAR4('T', 'P', 'O', 'S'):
-+               case CHAR4('T', 'R', 'C', 'K'):
-+               case CHAR4('T', 'R', 'D', 'A'):
-+               case CHAR4('T', 'R', 'S', 'N'):
-+               case CHAR4('T', 'R', 'S', 'O'):
-+               case CHAR4('T', 'S', 'I', 'Z'):
-+               case CHAR4('T', 'S', 'R', 'C'):
-+               case CHAR4('T', 'S', 'S', 'E'):
-+               case CHAR4('T', 'Y', 'E', 'R'):
-+               case CHAR4('T', 'X', 'X', 'X'):
-+               case CHAR4('U', 'F', 'I', 'D'):
-+               case CHAR4('U', 'S', 'E', 'R'):
-+               case CHAR4('U', 'S', 'L', 'T'):
-+               case CHAR4('W', 'C', 'O', 'M'):
-+               case CHAR4('W', 'C', 'O', 'P'):
-+               case CHAR4('W', 'O', 'A', 'F'):
-+               case CHAR4('W', 'O', 'A', 'R'):
-+               case CHAR4('W', 'O', 'A', 'S'):
-+               case CHAR4('W', 'O', 'R', 'S'):
-+               case CHAR4('W', 'P', 'A', 'Y'):
-+               case CHAR4('W', 'P', 'U', 'B'):
-+               case CHAR4('W', 'X', 'X', 'X'):
-+               case CHAR4('T', 'I', 'T', '3'):
-+                       key = "other_info : ";
-+                       value = &id3v2->other_info;
-+                       break;
-+               case CHAR4('P', 'R', 'I', 'V'):
-+                       key = "private_frame : ";
-+                       value = &id3v2->private_frame;
-+                       break;
-+               case CHAR4('T', 'A', 'L', 'B'):
-+                       key = "album_movie_show_title : ";
-+                       value = &id3v2->album_movie_show_title;
-+                       break;
-+               case CHAR4('T', 'C', 'O', 'M'):
-+                       key = "composer_name : ";
-+                       value = &id3v2->composer_name;
-+                       break;
-+               case CHAR4('T', 'C', 'O', 'N'):
-+                       key = "content_type : ";
-+                       value = &id3v2->content_type;
-+                       break;
-+               case CHAR4('T', 'E', 'N', 'C'):
-+                       key = "encoded_by : ";
-+                       value = &id3v2->encoded_by;
-+                       break;
-+               case CHAR4('T', 'E', 'X', 'T'):
-+                       key = "lyricist_text_writer : ";
-+                       value = &id3v2->lyricist_text_writer;
-+                       break;
-+               case CHAR4('T', 'I', 'T', '1'):
-+                       key = "content_group_description : ";
-+                       value = &id3v2->content_group_description;
-+                       break;
-+               case CHAR4('T', 'I', 'T', '2'):
-+                       key = "title_songname_content_description : ";
-+                       value = &id3v2->title_songname_content_description;
-+                       break;
-+               case CHAR4('T', 'O', 'A', 'L'):
-+                       key = "original_album_movie_show_title : ";
-+                       value = &id3v2->original_album_movie_show_title;
-+                       break;
-+               case CHAR4('T', 'O', 'P', 'E'):
-+                       key = "original_artist_performer : ";
-+                       value = &id3v2->original_artist_performer;
-+                       break;
-+               case CHAR4('T', 'O', 'W', 'N'):
-+                       key = "file_owner_licensee : ";
-+                       value = &id3v2->file_owner_licensee;
-+                       break;
-+               case CHAR4('T', 'P', 'E', '1'):
-+                       key = "lead_performer_soloist : ";
-+                       value = &id3v2->lead_performer_soloist;
-+                       break;
-+               case CHAR4('T', 'P', 'U', 'B'):
-+                       key =  "publisher : ";
-+                       value = &id3v2->publisher;
-+                       break;
-+               default:
-+                       /* skipping the read 10 bytes */
-+                       buf_update_val = -10;
-+                       id3v2->header_end = 1;
-+                       value = 0;
-+                       key = 0;
-+                       break;
-+               }
-+
-+               if (value != 0)
-+                       buf_update_val = get_info(&buffer[bytes_consumed],
-+                                                 avail_inp, size, value);
-+
-+               /* Negative value for buf_update_val means one of two things:
-+                * 1. The default case happened and we're done with ID3V2 tag
-+                *    frames, or
-+                * 2. get_info() returned -1 to indicate that more input is
-+                *    required to decode this frame of the tag.
-+                */
-+               if (buf_update_val >= 0)
-+                       display2(value,
-+                                umin(value->max_size, buf_update_val), key);
-+
-+               if (buf_update_val == -1) {
-+                       id3v2->bytes_consumed += bytes_consumed;
-+                       return 1;
-+               }
-+
-+               bytes_consumed += buf_update_val;
-+
-+               /* Is there enough input left (10 bytes) to begin
-+                * decoding another frame? If not, bag out temporarily
-+                * now. The caller will refill our input buffer and
-+                * call us again with continue_flag == 1.
-+                */
-+               if (insize - bytes_consumed < 10) {
-+                       id3v2->bytes_consumed += bytes_consumed;
-+                       return 0; /* not completely decoded */
-+               }
-+       }
-+
-+       id3v2->bytes_consumed += bytes_consumed;
-+       if ((id3v2->bytes_consumed + 10) < id3v2->id3_v2_header.size)
-+               return 0; /* not completely decoded */
-+
-+       return 1; /* completely decoded */
-+}
-+
-+/*******************************************************
-+ *  function name   : get_id3_v2_bytes
-+ *
-+ *  description     : tells the size of ID3V2 tag.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer          input buffer
-+ *
-+ *  values returned : bytes consumed
-+ ********************************************************/
-+WORD32 get_id3_v2_bytes(UWORD8 *buffer)
-+{
-+       WORD32 size;
-+
-+       /* making the msb of each byte zero */
-+       size  =  (buffer[9] & 0x7f);
-+       size |= ((buffer[8] & 0x7f) << 7);
-+       size |= ((buffer[7] & 0x7f) << 14);
-+       size |= ((buffer[6] & 0x7f) << 21);
-+
-+       return (size + 10);
-+}
-+
-+/****************************************************
-+ *  function name   : get_info
-+ *
-+ *  description     : read the frame information from the input buffer.
-+ *
-+ *  arguments       : input parameters
-+ *
-+ *  values returned : update value for buffer
-+ ****************************************************/
-+WORD32 get_info(const char *inp_buffer,
-+               unsigned int         avail_inp,
-+               WORD32               tag_size,
-+               id3_v2_frame_struct *dest)
-+{
-+       WORD32 j;
-+
-+       /* setting the tag to indicate the presence of frame */
-+       dest->tag_present = 1;
-+       /* If there isn't enough input available, we punt back to the top
-+        * level and ask for more.
-+        */
-+       if (avail_inp < umin(tag_size, dest->max_size))
-+               return -1;
-+
-+       if (dest->max_size >= tag_size) {
-+               for (j = 0; j < tag_size ; j++)
-+                       dest->frame_data[j] = inp_buffer[j];
-+       } else {
-+               dest->exceeds_buffer_size = 1;
-+               for (j = 0; j < dest->max_size ; j++)
-+                       dest->frame_data[j] = inp_buffer[j];
-+       }
-+       return tag_size;
-+}
-- 
-2.7.4
diff --git a/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch b/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch
deleted file mode 100755
index 795447118..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 4d4bc0a958fe254531920095fbabc241aad88113 Mon Sep 17 00:00:00 2001
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-Date: Tue, 28 Jul 2020 13:00:36 +0800
-Subject: [PATCH] cplay: Support wave file
-The supported format is mono/stereo, S16_LE/S32_LE, 8kHz-192kHz.
-Command is:
-cplay  -c x -I PCM test.wav
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
- include/tinycompress/wave_formats.h |  51 +++++++++++++
- src/utils/cplay.c                   | 107 ++++++++++++++++++++++++++++
- 2 files changed, 158 insertions(+)
- create mode 100644 include/tinycompress/wave_formats.h
--- /dev/null
-+++ b/include/tinycompress/wave_formats.h
-@@ -0,0 +1,53 @@
-+#ifndef WAVE_FORMATS_H
-+#define WAVE_FORMATS_H         1
-+
-+#include <sys/types.h>
-+
-+#define COMPOSE_ID(a,b,c,d)    ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24))
-+
-+#define WAV_RIFF               COMPOSE_ID('R','I','F','F')
-+#define WAV_RIFX               COMPOSE_ID('R','I','F','X')
-+#define WAV_WAVE               COMPOSE_ID('W','A','V','E')
-+#define WAV_FMT                        COMPOSE_ID('f','m','t',' ')
-+#define WAV_DATA               COMPOSE_ID('d','a','t','a')
-+
-+/* WAVE fmt block constants from Microsoft mmreg.h header */
-+#define WAV_FMT_PCM             0x0001
-+#define WAV_FMT_IEEE_FLOAT      0x0003
-+#define WAV_FMT_DOLBY_AC3_SPDIF 0x0092
-+#define WAV_FMT_EXTENSIBLE      0xfffe
-+
-+/* Used with WAV_FMT_EXTENSIBLE format */
-+#define WAV_GUID_TAG           "\x00\x00\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71"
-+
-+typedef struct {
-+       u_int magic;            /* 'RIFF' */
-+       u_int length;           /* filelen */
-+       u_int type;             /* 'WAVE' */
-+} WaveHeader;
-+
-+typedef struct {
-+       u_short format;         /* see WAV_FMT_* */
-+       u_short channels;
-+       u_int sample_fq;        /* frequence of sample */
-+       u_int byte_p_sec;
-+       u_short byte_p_spl;     /* samplesize; 1 or 2 bytes */
-+       u_short bit_p_spl;      /* 8, 12 or 16 bit */
-+} WaveFmtBody;
-+
-+typedef struct {
-+       WaveFmtBody format;
-+       u_short ext_size;
-+       u_short bit_p_spl;
-+       u_int channel_mask;
-+       u_short guid_format;    /* WAV_FMT_* */
-+       u_char guid_tag[14];    /* WAV_GUID_TAG */
-+} WaveFmtExtensibleBody;
-+
-+typedef struct {
-+       u_int type;             /* 'data' */
-+       u_int length;           /* samplecount */
-+} WaveChunkHeader;
-+
-+
-+#endif                         /* FORMATS */
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -1,4 +1,6 @@
- /*
-+ * Copyright 2020 NXP
-+ *
-  * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
-  * redistributing this file, you may do so under either license.
-  *
-@@ -73,6 +75,8 @@
- #include "tinycompress/tinycompress.h"
- #include "tinycompress/tinymp3.h"
- #include "tinycompress/id3_tag_decode.h"
-+#include "tinycompress/wave_formats.h"
-+#include <alsa/asoundlib.h>
- 
- static int verbose;
- static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM;
-@@ -166,6 +170,77 @@ static int parse_mp3_header(struct mp3_h
-        return 0;
- }
- 
-+static int parse_wav_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate,
-+                     unsigned int *format) {
-+       WaveHeader wave_header;
-+       WaveChunkHeader chunk_header;
-+       WaveFmtBody fmt_body;
-+       int more_chunks = 1;
-+
-+       fread(&wave_header, sizeof(WaveHeader), 1, file);
-+       if ((wave_header.magic != WAV_RIFF) ||
-+           (wave_header.type != WAV_WAVE)) {
-+               fprintf(stderr, "Error: it is not a riff/wave file\n");
-+               return -1;
-+       }
-+
-+       do {
-+               fread(&chunk_header, sizeof(WaveChunkHeader), 1, file);
-+               switch (chunk_header.type) {
-+               case WAV_FMT:
-+                       fread(&fmt_body, sizeof(WaveFmtBody), 1, file);
-+                       /* If the format header is larger, skip the rest */
-+                       if (chunk_header.length > sizeof(WaveFmtBody))
-+                               fseek(file, chunk_header.length - sizeof(WaveFmtBody), SEEK_CUR);
-+
-+                       *num_channels = fmt_body.channels;
-+                       *sample_rate = fmt_body.sample_fq;
-+
-+                       switch (fmt_body.bit_p_spl) {
-+                       case 8:
-+                               *format = SND_PCM_FORMAT_U8;
-+                               break;
-+                       case 16:
-+                               *format = SND_PCM_FORMAT_S16_LE;
-+                               break;
-+                       case 24:
-+                               switch (fmt_body.byte_p_spl / fmt_body.channels) {
-+                               case 3:
-+                                       *format = SND_PCM_FORMAT_S24_3LE;
-+                                       break;
-+                               case 4:
-+                                       *format = SND_PCM_FORMAT_S24_LE;
-+                                       break;
-+                               default:
-+                                       fprintf(stderr, "format error\n");
-+                                       return -1;
-+                               }
-+                               break;
-+                       case 32:
-+                               if (fmt_body.format == WAV_FMT_PCM) {
-+                                       *format = SND_PCM_FORMAT_S32_LE;
-+                               } else if (fmt_body.format == WAV_FMT_IEEE_FLOAT) {
-+                                       *format = SND_PCM_FORMAT_FLOAT_LE;
-+                               }
-+                               break;
-+                       default:
-+                               fprintf(stderr, "format error\n");
-+                               return -1;
-+                       }
-+                       break;
-+               case WAV_DATA:
-+                       /* Stop looking for chunks */
-+                       more_chunks = 0;
-+                       break;
-+               default:
-+                       /* Unknown chunk, skip bytes */
-+                       fseek(file, chunk_header.length, SEEK_CUR);
-+               }
-+       } while (more_chunks);
-+
-+       return 0;
-+}
-+
- static int print_time(struct compress *compress)
- {
-        unsigned int avail;
-@@ -385,6 +460,35 @@ void get_codec_iec(FILE *file, struct co
-        codec->format = 0;
- }
- 
-+void get_codec_pcm(FILE *file, struct compr_config *config,
-+               struct snd_codec *codec)
-+{
-+       unsigned int channels, rate, format;
-+
-+       if (parse_wav_header(file, &channels, &rate, &format) == -1) {
-+               fclose(file);
-+               exit(EXIT_FAILURE);
-+       }
-+
-+       if (channels > 2 || (format != SND_PCM_FORMAT_S16_LE && format != SND_PCM_FORMAT_S32_LE) ||
-+           rate > 192000) {
-+               fprintf(stderr, "unsupported wave file\n");
-+               fclose(file);
-+               exit(EXIT_FAILURE);
-+       }
-+
-+       codec->id = SND_AUDIOCODEC_PCM;
-+       codec->ch_in = channels;
-+       codec->ch_out = channels;
-+       codec->sample_rate = rate;
-+       codec->bit_rate = 0;
-+       codec->rate_control = 0;
-+       codec->profile = SND_AUDIOPROFILE_PCM;
-+       codec->level = 0;
-+       codec->ch_mode = 0;
-+       codec->format = format;
-+}
-+
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-                unsigned long codec_id)
-@@ -411,6 +515,9 @@ void play_samples(char *name, unsigned i
-        case SND_AUDIOCODEC_IEC61937:
-                get_codec_iec(file, &config, &codec);
-                break;
-+       case SND_AUDIOCODEC_PCM:
-+               get_codec_pcm(file, &config, &codec);
-+               break;
-        default:
-                fprintf(stderr, "codec ID %ld is not supported\n", codec_id);
-                exit(EXIT_FAILURE);
diff --git a/recipes-multimedia/tinycompress/tinycompress/0003-cplay-Add-pause-feature.patch b/recipes-multimedia/tinycompress/tinycompress/0003-cplay-Add-pause-feature.patch
deleted file mode 100755
index 7d8492b7d..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0003-cplay-Add-pause-feature.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 6f778c21ee357a662cdd758cff578a3e4b85eedf Mon Sep 17 00:00:00 2001
-From: Zhang Peng <peng.zhang_8@nxp.com>
-Date: Tue, 4 Aug 2020 15:29:29 +0800
-Subject: [PATCH] cplay: Add pause feature
-Add option: -p pause
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Zhang Peng <peng.zhang_8@nxp.com>
---
- src/utils/cplay.c | 56 +++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 52 insertions(+), 4 deletions(-)
-diff --git a/src/utils/cplay.c b/src/utils/cplay.c
-index 8882f4d..8e3dcbb 100644
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -117,6 +117,9 @@ static void usage(void)
-                "-f\tfragments\n\n"
-                "-v\tverbose mode\n"
-                "-h\tPrints this help list\n\n"
-+               "-p\tpause\n"
-+               "-m\tpause blocks\n"
-+               "-n\tpause time duration\n"
-                "Example:\n"
-                "\tcplay -c 1 -d 2 test.mp3\n"
-                "\tcplay -f 5 test.mp3\n\n"
-@@ -133,7 +136,8 @@ static void usage(void)
- 
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-               unsigned long codec_id);
-+               unsigned long codec_id, int pause_count, int pause_block,
-+               int pause_duration);
- 
- struct mp3_header {
-        uint16_t sync;
-@@ -262,12 +266,15 @@ int main(int argc, char **argv)
-        int c, i;
-        unsigned int card = 0, device = 0, frag = 0;
-        unsigned int codec_id = SND_AUDIOCODEC_MP3;
-+       int pause_count = 0;
-+       int pause_block = 6;
-+       int pause_duration = 10;
- 
-        if (argc < 2)
-                usage();
- 
-        verbose = 0;
-       while ((c = getopt(argc, argv, "hvb:f:c:d:I:")) != -1) {
-+       while ((c = getopt(argc, argv, "hvb:f:c:d:I:p:m:n:")) != -1) {
-                switch (c) {
-                case 'h':
-                        usage();
-@@ -306,6 +313,23 @@ int main(int argc, char **argv)
-                case 'v':
-                        verbose = 1;
-                        break;
-+               case 'p':
-+                       pause_count = strtol(optarg, NULL, 10);
-+                       break;
-+               case 'm':
-+                       pause_block = strtol(optarg, NULL, 10);
-+                       if (pause_duration < 0) {
-+                               printf("Set wrong paramter! Set duration default 6.\n");
-+                               pause_duration = 6;
-+                       }
-+                       break;
-+               case 'n':
-+                       pause_duration = strtol(optarg, NULL, 10);
-+                       if (pause_duration < 0) {
-+                               printf("Set wrong paramter! Set duration default 10.\n");
-+                               pause_duration = 10;
-+                       }
-+                       break;
-                default:
-                        exit(EXIT_FAILURE);
-                }
-@@ -315,7 +339,7 @@ int main(int argc, char **argv)
- 
-        file = argv[optind];
- 
-       play_samples(file, card, device, buffer_size, frag, codec_id);
-+       play_samples(file, card, device, buffer_size, frag, codec_id, pause_count, pause_block, pause_duration);
- 
-        fprintf(stderr, "Finish Playing.... Close Normally\n");
-        exit(EXIT_SUCCESS);
-@@ -491,7 +515,8 @@ void get_codec_pcm(FILE *file, struct compr_config *config,
- 
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-               unsigned long codec_id)
-+               unsigned long codec_id, int pause_count, int pause_block,
-+               int pause_duration)
- {
-        struct compr_config config;
-        struct snd_codec codec;
-@@ -499,6 +524,7 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-        FILE *file;
-        char *buffer;
-        int size, num_read, wrote;
-+       int write_count = 0;
- 
-        if (verbose)
-                printf("%s: entry\n", __func__);
-@@ -574,6 +600,13 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-        if (verbose)
-                printf("%s: You should hear audio NOW!!!\n", __func__);
- 
-+       if (pause_count > 0) {
-+               printf("sleep...\n");
-+               compress_pause(compress);
-+               sleep(pause_duration);
-+               compress_resume(compress);
-+       }
-+
-        do {
-                num_read = fread(buffer, 1, size, file);
-                if (num_read > 0) {
-@@ -592,8 +625,23 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-                                printf("%s: wrote %d\n", __func__, wrote);
-                        }
-                }
-+               write_count++;
-+               if ((pause_count > 0) && (write_count % pause_block == 0)) {
-+                               printf("pause...\n");
-+                               compress_pause(compress);
-+                               sleep(pause_duration);
-+                               printf("pause release...\n");
-+                               compress_resume(compress);
-+                               pause_count--;
-+               }
-        } while (num_read > 0);
- 
-+       if (pause_count > 0) {
-+               compress_pause(compress);
-+               sleep(5);
-+               compress_resume(compress);
-+       }
-+
-        if (verbose)
-                printf("%s: exit success\n", __func__);
-        /* issue drain if it supports */
-- 
-2.17.1
diff --git a/recipes-multimedia/tinycompress/tinycompress/0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch b/recipes-multimedia/tinycompress/tinycompress/0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch
deleted file mode 100755
index dfedd186a..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a2892bf5db7520689fa9cb1d1589fa804bd9dc1a Mon Sep 17 00:00:00 2001
-From: Bing Song <bing.song@nxp.com>
-Date: Tue, 18 Aug 2020 15:26:51 +0800
-Subject: [PATCH] tinycompress: pass NULL buffer with 0 size to driver.
-The NULL buffer with 0 size to indecate driver drain input data with
-non-block mode. The defaul drain is block mode.
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Bing Song <bing.song@nxp.com>
---
- src/lib/compress.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/src/lib/compress.c b/src/lib/compress.c
-index bba4fcf..d66df0b 100644
--- a/src/lib/compress.c
-+++ b/src/lib/compress.c
-@@ -315,7 +315,8 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size
-        fds.events = POLLOUT;
- 
-        /*TODO: treat auto start here first */
-       while (size) {
-+       /* NULL buffer with 0 size for non-block drain */
-+       do {
-                if (ioctl(compress->fd, SNDRV_COMPRESS_AVAIL, &avail))
-                        return oops(compress, errno, "cannot get avail");
- 
-@@ -357,7 +358,7 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size
-                size -= written;
-                cbuf += written;
-                total += written;
-       }
-+       } while (size);
-        return total;
- }
- 
-- 
-2.17.1
diff --git a/recipes-multimedia/tinycompress/tinycompress/0005-cplay-Support-aac-streams.patch b/recipes-multimedia/tinycompress/tinycompress/0005-cplay-Support-aac-streams.patch
deleted file mode 100755
index 2f36551ab..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0005-cplay-Support-aac-streams.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 2912f8573cea25fbd38ac7a8b68af2ea6a05e599 Mon Sep 17 00:00:00 2001
-From: Zhang Peng <peng.zhang_8@nxp.com>
-Date: Wed, 28 Oct 2020 19:08:53 +0800
-Subject: [PATCH] cplay: Support aac streams
-Support run aac format streams for cplay.
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Zhang Peng <peng.zhang_8@nxp.com>
---
- src/utils/cplay.c | 210 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 210 insertions(+)
-diff --git a/src/utils/cplay.c b/src/utils/cplay.c
-index 8e3dcbb..2a1464a 100644
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -245,6 +245,190 @@ static int parse_wav_header(FILE *file, unsigned int *num_channels, unsigned int
-        return 0;
- }
- 
-+int find_adts_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate, unsigned int *format)
-+{
-+       int ret;
-+       unsigned char buf[5];
-+
-+       ret = fread(buf, sizeof(buf), 1, file);
-+       if (ret < 0) {
-+               fprintf(stderr, "open file error: %d\n", ret);
-+               return 0;
-+       }
-+       fseek(file, 0, SEEK_SET);
-+
-+       if ((buf[0] != 0xff) || (buf[1] & 0xf0 != 0xf0))
-+               return 0;
-+       /* mpeg id */
-+       switch (buf[1]>>3 & 0x1) {
-+       case 0x0:
-+               *format = SND_AUDIOSTREAMFORMAT_MP4ADTS;
-+               break;
-+       case 0x1:
-+               *format = SND_AUDIOSTREAMFORMAT_MP2ADTS;
-+               break;
-+       default:
-+               fprintf(stderr, "can't find stream format\n");
-+               break;
-+       }
-+       /* sample_rate */
-+       switch (buf[2]>>2 & 0xf) {
-+       case 0x0:
-+               *sample_rate = 96000;
-+               break;
-+       case 0x1:
-+               *sample_rate = 88200;
-+               break;
-+       case 0x2:
-+               *sample_rate = 64000;
-+               break;
-+       case 0x3:
-+               *sample_rate = 48000;
-+               break;
-+       case 0x4:
-+               *sample_rate = 44100;
-+               break;
-+       case 0x5:
-+               *sample_rate = 32000;
-+               break;
-+       case 0x6:
-+               *sample_rate = 24000;
-+               break;
-+       case 0x7:
-+               *sample_rate = 22050;
-+               break;
-+       case 0x8:
-+               *sample_rate = 16000;
-+               break;
-+       case 0x9:
-+               *sample_rate = 12000;
-+               break;
-+       case 0xa:
-+               *sample_rate = 11025;
-+               break;
-+       case 0xb:
-+               *sample_rate = 8000;
-+               break;
-+       case 0xc:
-+               *sample_rate = 7350;
-+               break;
-+       default:
-+               break;
-+       }
-+       /* channel */
-+       switch (((buf[2]&0x1) << 2) | (buf[3]>>6)) {
-+       case 1:
-+               *num_channels = 1;
-+               break;
-+       case 2:
-+               *num_channels = 2;
-+               break;
-+       case 3:
-+               *num_channels = 3;
-+               break;
-+       case 4:
-+               *num_channels = 4;
-+               break;
-+       case 5:
-+               *num_channels = 5;
-+               break;
-+       case 6:
-+               *num_channels = 6;
-+               break;
-+       case 7:
-+               *num_channels = 7;
-+               break;
-+       default:
-+               break;
-+       }
-+       return 1;
-+}
-+
-+static const int aac_sample_rates[] = { 96000, 88200, 64000, 48000, 44100,
-+  32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350
-+};
-+
-+#define MAX_SR_NUM sizeof(aac_sample_rates)/sizeof(aac_sample_rates[0])
-+
-+static int get_sample_rate_from_index(int sr_index)
-+{
-+       if (sr_index >= 0 && sr_index < MAX_SR_NUM)
-+               return aac_sample_rates[sr_index];
-+
-+       return 0;
-+}
-+
-+int find_adif_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate, unsigned int *format)
-+{
-+       int ret;
-+       unsigned char adif_id[4];
-+       unsigned char adif_header[20];
-+       int bitstream_type;
-+       int bitrate;
-+       int object_type;
-+       int sr_index;
-+       int skip_size = 0;
-+
-+       ret = fread(adif_id, sizeof(unsigned char), 4, file);
-+       if (ret < 0) {
-+               fprintf(stderr, "read data from file err: %d\n", ret);
-+               return 0;
-+       }
-+       /* adif id */
-+       if ((adif_id[0] != 0x41) || (adif_id[1] != 0x44) ||
-+               (adif_id[2] != 0x49) || (adif_id[3] != 0x46))
-+               return 0;
-+
-+       fread(adif_header, sizeof(unsigned char), 20, file);
-+
-+       /* copyright string */
-+       if (adif_header[0] & 0x80)
-+               skip_size = 9;
-+
-+       bitstream_type = adif_header[0 + skip_size] & 0x10;
-+       bitrate =
-+                ((unsigned int) (adif_header[0 + skip_size] & 0x0f) << 19) |
-+                ((unsigned int) adif_header[1 + skip_size] << 11) |
-+                ((unsigned int) adif_header[2 + skip_size] << 3) |
-+                ((unsigned int) adif_header[3 + skip_size] & 0xe0);
-+
-+       if (bitstream_type == 0) {
-+               object_type = ((adif_header[6 + skip_size] & 0x01) << 1) |
-+                       ((adif_header[7 + skip_size] & 0x80) >> 7);
-+               sr_index = (adif_header[7 + skip_size] & 0x78) >> 3;
-+       }
-+       /* VBR */
-+       else {
-+               object_type = (adif_header[4 + skip_size] & 0x18) >> 3;
-+               sr_index = ((adif_header[4 + skip_size] & 0x07) << 1) |
-+                       ((adif_header[5 + skip_size] & 0x80) >> 7);
-+       }
-+
-+       /* sample rate */
-+       *sample_rate = get_sample_rate_from_index(sr_index);
-+
-+       /* FIXME: assume channels is 2 */
-+       *num_channels = 2;
-+
-+       *format = SND_AUDIOSTREAMFORMAT_ADIF;
-+       fseek(file, 0, SEEK_SET);
-+       return 1;
-+}
-+
-+static int parse_aac_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate, unsigned int *format)
-+{
-+       if (find_adts_header(file, num_channels, sample_rate, format))
-+               return 1;
-+       else if (find_adif_header(file, num_channels, sample_rate, format))
-+               return 1;
-+       else {
-+               fprintf(stderr, "can't find streams format\n");
-+               return 0;
-+       }
-+
-+       return 1;
-+}
-+
- static int print_time(struct compress *compress)
- {
-        unsigned int avail;
-@@ -513,6 +697,29 @@ void get_codec_pcm(FILE *file, struct compr_config *config,
-        codec->format = format;
- }
- 
-+void get_codec_aac(FILE *file, struct compr_config *config,
-+               struct snd_codec *codec)
-+{
-+       unsigned int channels, rate, format;
-+
-+       if (parse_aac_header(file, &channels, &rate, &format) == 0) {
-+               fclose(file);
-+               exit(EXIT_FAILURE);
-+       };
-+       fseek(file, 0, SEEK_SET);
-+
-+       codec->id = SND_AUDIOCODEC_AAC;
-+       codec->ch_in = channels;
-+       codec->ch_out = channels;
-+       codec->sample_rate = rate;
-+       codec->bit_rate = 0;
-+       codec->rate_control = 0;
-+       codec->profile = SND_AUDIOPROFILE_AAC;
-+       codec->level = 0;
-+       codec->ch_mode = 0;
-+       codec->format = format;
-+
-+}
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-                unsigned long codec_id, int pause_count, int pause_block,
-@@ -544,6 +751,9 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-        case SND_AUDIOCODEC_PCM:
-                get_codec_pcm(file, &config, &codec);
-                break;
-+       case SND_AUDIOCODEC_AAC:
-+               get_codec_aac(file, &config, &codec);
-+               break;
-        default:
-                fprintf(stderr, "codec ID %ld is not supported\n", codec_id);
-                exit(EXIT_FAILURE);
-- 
-2.17.1
diff --git a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb b/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb
deleted file mode 100644
index 803c38dfb..000000000
--- a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "A library to handle compressed formats like MP3 etc."
-LICENSE = "LGPL-2.1-only | BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0"
-DEPENDS = "alsa-lib"
-SRC_URI = "git://git.alsa-project.org/tinycompress.git;protocol=git;branch=master \
-           file://0001-tinycompress-Add-id3-decoding.patch \
-           file://0002-cplay-Support-wave-file.patch \
-           file://0003-cplay-Add-pause-feature.patch \
-           file://0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch \
-           file://0005-cplay-Support-aac-streams.patch \
-"
-SRCREV = "995f2ed91045dad8c20485ab1a64727d22cd92e5"
-S = "${WORKDIR}/git"
-inherit autotools pkgconfig
diff --git a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
new file mode 100644
index 000000000..48edf0769
--- /dev/null
+++ b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A library to handle compressed formats like MP3 etc."
+LICENSE = "LGPL-2.1-only | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0"
+DEPENDS = "alsa-lib"
+inherit autotools pkgconfig
+PV .= "+git"
+SRC_URI = "git://github.com/alsa-project/tinycompress.git;protocol=https;branch=master \
+"
+SRCREV = "f3ba6e5c2126f2fb07e3d890f990d50c3e204e67"
+EXTRA_OECONF:append = " --enable-pcm"
+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 4cfe18bf8..7aeff9fd5 100644
--- a/recipes-security/optee-imx/optee-client-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc
@@ -1,7 +1,36 @@
-# Copyright (C) 2017-2021 NXP
+# 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
 require optee-client-fslc.inc
-SRC_URI += "git://github.com/nxp-imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH}"
+DEPENDS += "util-linux-libuuid"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+FILESEXTRAPATHS:prepend := "${THISDIR}/optee-client:"
+SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https"
+SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${SRCBRANCH} "
+OPTEE_CLIENT_SRC ?= "git://github.com/nxp-imx/imx-optee-client.git;protocol=https"
+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 92f9f1d1f..2c1a0f450 100644
--- a/recipes-security/optee-imx/optee-client-fslc.inc
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -1,42 +1,41 @@
-# Copyright (C) 2017-2021 NXP
+# 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
+SUMMARY = "OP-TEE Client API"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
+HOMEPAGE = "https://www.op-tee.org/"
-SUMMARY = "OPTEE Client libs"
-HOMEPAGE = "http://www.optee.org/"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
-SRC_URI = "file://tee-supplicant.service"
+inherit systemd update-rc.d cmake
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-inherit python3native systemd features_check pkgconfig
-DEPENDS = "util-linux-libuuid"
-REQUIRED_MACHINE_FEATURES = "optee"
-SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
+SRC_URI = " \
+    git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https \
-EXTRA_OEMAKE = " \
+    file://tee-supplicant@.service \
-        -C ${S} O=${B} \
+    file://tee-supplicant.sh \
 "
-do_install () {
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
-        oe_runmake -C ${S} install
-        install -D -p -m0644 ${B}/export/usr/lib/libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0.0
+EXTRA_OECMAKE = " \
-        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1
+    -DBUILD_SHARED_LIBS=ON \
-        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so
+    -DCFG_TEE_FS_PARENT_PATH='${localstatedir}/lib/tee' \
+"
+EXTRA_OECMAKE:append:toolchain-clang = " -DCFG_WERROR=0"
-        install -D -p -m0644 ${B}/export/usr/lib/libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0.1.0
+do_install:append() {
-        ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0
+    install -D -p -m0644 ${UNPACKDIR}/tee-supplicant@.service ${D}${systemd_system_unitdir}/tee-supplicant@.service
-        ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so
+    install -D -p -m0755 ${UNPACKDIR}/tee-supplicant.sh ${D}${sysconfdir}/init.d/tee-supplicant
-        install -D -p -m0755 ${B}/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant
+    sed -i -e s:@sysconfdir@:${sysconfdir}:g \
+           -e s:@sbindir@:${sbindir}:g \
+              ${D}${systemd_system_unitdir}/tee-supplicant@.service \
+              ${D}${sysconfdir}/init.d/tee-supplicant
+}
-        cp -a ${B}/export/usr/include ${D}${includedir}
+SYSTEMD_SERVICE:${PN} = "tee-supplicant@.service"
-        sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${WORKDIR}/tee-supplicant.service
+INITSCRIPT_PACKAGES = "${PN}"
-        install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service
+INITSCRIPT_NAME:${PN} = "tee-supplicant"
-}
+INITSCRIPT_PARAMS:${PN} = "start 10 1 2 3 4 5 . stop 90 0 6 ."
diff --git a/recipes-security/optee-imx/optee-client/tee-supplicant.service b/recipes-security/optee-imx/optee-client/tee-supplicant.service
deleted file mode 100644
index 0e2b4f6ba..000000000
--- a/recipes-security/optee-imx/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-imx/optee-client/tee-supplicant.sh b/recipes-security/optee-imx/optee-client/tee-supplicant.sh
new file mode 100644
index 000000000..b4d219502
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client/tee-supplicant.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Source function library
+. /etc/init.d/functions
+NAME=tee-supplicant
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DESC="OP-TEE Supplicant"
+DAEMON=@sbindir@/$NAME
+test -f $DAEMON || exit 0
+test -f @sysconfdir@/default/$NAME && . @sysconfdir@/default/$NAME
+test -f @sysconfdir@/default/rcS && . @sysconfdir@/default/rcS
+SSD_OPTIONS="--oknodo --quiet --exec $DAEMON -- -d $OPTARGS"
+set -e
+case $1 in
+    start)
+            echo -n "Starting $DESC: "
+            start-stop-daemon --start $SSD_OPTIONS
+        echo "${DAEMON##*/}."
+        ;;
+    stop)
+            echo -n "Stopping $DESC: "
+            start-stop-daemon --stop $SSD_OPTIONS
+        echo "${DAEMON##*/}."
+        ;;
+    restart|force-reload)
+            $0 stop
+            sleep 1
+            $0 start
+        ;;
+    status)
+        status ${DAEMON} || exit $?
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
+        exit 1
+        ;;
+esac
+exit 0
diff --git a/recipes-security/optee-imx/optee-client/tee-supplicant@.service b/recipes-security/optee-imx/optee-client/tee-supplicant@.service
new file mode 100644
index 000000000..72c0b9aa5
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client/tee-supplicant@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TEE Supplicant on %i
+[Service]
+User=root
+EnvironmentFile=-@sysconfdir@/default/tee-supplicant
+ExecStart=@sbindir@/tee-supplicant $OPTARGS
+[Install]
+WantedBy=basic.target
diff --git a/recipes-security/optee-imx/optee-client/tee-udev.rules b/recipes-security/optee-imx/optee-client/tee-udev.rules
new file mode 100644
index 000000000..43fafd8c9
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client/tee-udev.rules
@@ -0,0 +1,7 @@
+# tee devices can only be accessed by the teeclnt group members
+KERNEL=="tee[0-9]*", TAG+="systemd", MODE="0660", GROUP="teeclnt"
+# 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="tee", \
+    TAG+="systemd", ENV{SYSTEMD_WANTS}+="tee-supplicant@%k.service"
diff --git a/recipes-security/optee-imx/optee-client_4.0.0.imx.bb b/recipes-security/optee-imx/optee-client_4.0.0.imx.bb
deleted file mode 100644
index b404dd5b7..000000000
--- a/recipes-security/optee-imx/optee-client_4.0.0.imx.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require optee-client-fslc-imx.inc
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee"
-DEPENDS += "util-linux"
-EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
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
new file mode 100644
index 000000000..322f998fc
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client_4.4.0.imx.bb
@@ -0,0 +1,4 @@
+require optee-client-fslc-imx.inc
+SRCBRANCH = "lf-6.6.52_2.2.0"
+SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
diff --git a/recipes-security/optee-imx/optee-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc
index 6c96dc2bc..c89746dc4 100644
--- a/recipes-security/optee-imx/optee-fslc.inc
+++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -1,26 +1,40 @@
-HOMEPAGE = "http://www.optee.org/"
+# 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
-inherit python3native features_check
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
-REQUIRED_MACHINE_FEATURES = "optee"
+COMPATIBLE_MACHINE ?= "invalid"
+COMPATIBLE_MACHINE:qemuarm64 ?= "qemuarm64"
+COMPATIBLE_MACHINE:qemuarm ?= "qemuarm"
+# Please add supported machines below or set it in .bbappend or .conf
-DEPENDS = "python3-cryptography-native"
+OPTEEMACHINE ?= "${MACHINE}"
+OPTEEMACHINE:aarch64:qemuall ?= "vexpress-qemu_armv8a"
+OPTEEMACHINE:arm:qemuall ?= "vexpress-qemu_virt"
-S = "${WORKDIR}/git"
+OPTEE_ARCH = "null"
-B = "${WORKDIR}/build"
+OPTEE_ARCH:arm = "arm32"
-OPTEE_ARCH:arm     = "arm32"
 OPTEE_ARCH:aarch64 = "arm64"
+OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
+OPTEE_TOOLCHAIN = "${@d.getVar('TOOLCHAIN') or 'gcc'}"
+OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${OPTEE_TOOLCHAIN}", "gcc", d)}"
-COMPILER ?= "gcc"
+# Set here but not passed to EXTRA_OEMAKE by default as that breaks
-COMPILER:toolchain-clang = "clang"
+# the optee-os build
+TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta"
+EXTRA_OEMAKE += "V=1 \
+                 LIBGCC_LOCATE_CFLAGS='${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}' \
+                 COMPILER=${OPTEE_COMPILER} \
+                 OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
+                 TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
+                "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES = "${STAGING_LIBDIR_NATIVE}/ossl-modules"
 CFLAGS += "--sysroot=${STAGING_DIR_HOST}"
-CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
+# See the rationale in https://github.com/f-secure-foundry/advisories/blob/master/Security_Advisory-Ref_FSC-HWSEC-VR2021-0001-OP-TEE_TrustZone_bypass.txt.
-EXTRA_OEMAKE = " \
+CVE_STATUS[CVE-2021-36133] = "disputed: devices shipped open for development purposes"
-    COMPILER=${COMPILER} \
-    OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules \
-    OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${exec_prefix} \
-    -C ${S} O=${B} \
-"
diff --git a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
new file mode 100644
index 000000000..941182fe9
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -0,0 +1,62 @@
+# 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
+require optee-os-fslc.inc
+DEPENDS:append:arm = "u-boot-mkimage-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
+SRC_URI:remove = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
+SRC_URI:prepend = "${OPTEE_OS_SRC};branch=${SRCBRANCH} "
+SRC_URI:append = " file://0007-allow-setting-sysroot-for-clang.patch"
+SRC_URI:remove = "file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
+                  file://0002-optee-enable-clang-support.patch \
+                  file://0003-core-link-add-no-warn-rwx-segments.patch"
+OPTEE_OS_SRC ?= "git://github.com/nxp-imx/imx-optee-os.git;protocol=https"
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "optee"
+OPTEEMACHINE                   = "imx-${@d.getVar('MACHINE')[1:]}"
+OPTEEMACHINE:imx6qpdlsolox     = "imx-mx6qsabresd"
+OPTEEMACHINE:mx6ul-nxp-bsp     = "imx-mx6ulevk"
+OPTEEMACHINE:mx6ull-nxp-bsp    = "imx-mx6ullevk"
+OPTEEMACHINE:mx6ulz-nxp-bsp    = "imx-mx6ulzevk"
+OPTEEMACHINE:mx8mq-nxp-bsp     = "imx-mx8mqevk"
+OPTEEMACHINE:mx8mm-nxp-bsp     = "imx-mx8mmevk"
+OPTEEMACHINE:mx8mn-nxp-bsp     = "imx-mx8mnevk"
+OPTEEMACHINE:mx8mp-nxp-bsp     = "imx-mx8mpevk"
+OPTEEMACHINE:mx8mpul-nxp-bsp   = "imx-mx8mpevk"
+OPTEEMACHINE:mx8qm-nxp-bsp     = "imx-mx8qmmek"
+OPTEEMACHINE:mx8qxp-nxp-bsp    = "imx-mx8qxpmek"
+OPTEEMACHINE:mx8dx-nxp-bsp     = "imx-mx8dxmek"
+OPTEEMACHINE:mx8dxl-nxp-bsp    = "imx-mx8dxlevk"
+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:mx95-nxp-bsp      = "imx-mx95evk"
+# Strip the leading imx-
+PLATFORM_FLAVOR = "${@d.getVar('OPTEEMACHINE')[4:]}"
+EXTRA_OEMAKE:append = " \
+    CFG_TEE_TA_LOG_LEVEL=0 \
+    CFG_TEE_CORE_LOG_LEVEL=0 \
+"
+EXTRA_OEMAKE:append:imx8mq-lpddr4-wevk = " \
+    CFG_CORE_LARGE_PHYS_ADDR=y \
+    CFG_CORE_ARM64_PA_BITS=36 \
+    CFG_DDR_SIZE=0x100000000 \
+    CFG_TZDRAM_START=0xfe000000 \
+"
+EXTRA_OEMAKE:append:imx8dxlb0-fips-lpddr4-evk = " \
+    CFG_NXP_CAAM=n \
+"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-os-fslc-imx.inc b/recipes-security/optee-imx/optee-os-fslc-imx.inc
index 6b72e8277..5fe6a75a5 100644
--- a/recipes-security/optee-imx/optee-os-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-fslc-imx.inc
@@ -1,26 +1,26 @@
-require optee-os-fslc.inc
+# 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
-SRC_URI = "git://github.com/nxp-imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH}"
+require optee-os-common-fslc-imx.inc
-# The platform flavor corresponds to the Yocto machine without the leading 'i'.
+do_compile:arm() {
-PLATFORM_FLAVOR                   = "${@d.getVar('MACHINE')[1:]}"
+    oe_runmake -C ${S} all uTee
-PLATFORM_FLAVOR:imx6qdlsabresd    = "mx6qsabresd"
+}
-PLATFORM_FLAVOR:imx6qdlsabreauto  = "mx6qsabreauto"
-PLATFORM_FLAVOR:imx6qpdlsolox     = "mx6qsabresd"
-PLATFORM_FLAVOR:mx6ul-nxp-bsp     = "mx6ulevk"
-PLATFORM_FLAVOR:mx6ull-nxp-bsp    = "mx6ullevk"
-PLATFORM_FLAVOR:mx6ulz-nxp-bsp    = "mx6ulzevk"
-PLATFORM_FLAVOR:mx8mq-nxp-bsp     = "mx8mqevk"
-PLATFORM_FLAVOR:mx8mm-nxp-bsp     = "mx8mmevk"
-PLATFORM_FLAVOR:mx8mn-nxp-bsp     = "mx8mnevk"
-PLATFORM_FLAVOR:mx8mnul-nxp-bsp   = "mx8mnevk"
-PLATFORM_FLAVOR:mx8mp-nxp-bsp     = "mx8mpevk"
-PLATFORM_FLAVOR:mx8mpul-nxp-bsp   = "mx8mpevk"
-PLATFORM_FLAVOR:mx8qm-nxp-bsp     = "mx8qmmek"
-PLATFORM_FLAVOR:mx8qxp-nxp-bsp    = "mx8qxpmek"
-PLATFORM_FLAVOR:mx8dx-nxp-bsp     = "mx8dxmek"
-PLATFORM_FLAVOR:mx8dxl-nxp-bsp    = "mx8dxlevk"
-PLATFORM_FLAVOR:mx8ulp-nxp-bsp    = "mx8ulpevk"
-PLATFORM_FLAVOR:mx93-nxp-bsp      = "mx93evk"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+do_install:append () {
+    # Install embedded TAs
+    install -d ${D}${nonarch_base_libdir}/optee_armtz/
+    install -m 444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
+}
+do_deploy:append() {
+    cp ${B}/core/tee-raw.bin ${DEPLOYDIR}/${MLPREFIX}optee/tee.${PLATFORM_FLAVOR}.bin
+    ln -sf ${MLPREFIX}optee/tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/tee.bin
+}
+do_deploy:append:arm() {
+    cp ${B}/core/uTee ${DEPLOYDIR}/${MLPREFIX}optee/uTee-${OPTEE_BIN_EXT}
+    ln -sf ${MLPREFIX}optee/uTee-${OPTEE_BIN_EXT} ${DEPLOYDIR}/uTee-${OPTEE_BIN_EXT}
+}
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz"
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index b91a55311..56c0f3e12 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -1,87 +1,85 @@
-# Copyright (C) 2017-2021 NXP
+# 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
+SUMMARY = "OP-TEE Trusted OS"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Trusted side of the TEE"
+HOMEPAGE = "https://www.op-tee.org/"
-SUMMARY = "OPTEE OS"
-DESCRIPTION = "OPTEE OS"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
+inherit deploy python3native
 require optee-fslc.inc
-DEPENDS += "python3-pyelftools-native u-boot-mkimage-native"
+CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
+DEPENDS = "python3-pyelftools-native python3-cryptography-native"
 DEPENDS:append:toolchain-clang = " compiler-rt"
-inherit deploy autotools
+SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
-# Optee-os can be built for 32 bits and 64 bits at the same time
+B = "${WORKDIR}/build"
-# as long as the compilers are correctly defined.
-# For 64bits, CROSS_COMPILE64 must be set
-# When defining CROSS_COMPILE and CROSS_COMPILE64, we assure that
-# any 32 or 64 bits builds will pass
-EXTRA_OEMAKE += " \
-    PLATFORM=imx-${PLATFORM_FLAVOR} \
-    CROSS_COMPILE=${HOST_PREFIX} \
-    CROSS_COMPILE64=${HOST_PREFIX} \
-    CFLAGS32=--sysroot=${STAGING_DIR_HOST} \
-    CFLAGS64=--sysroot=${STAGING_DIR_HOST} \
-    CFG_TEE_TA_LOG_LEVEL=0 \
-    CFG_TEE_CORE_LOG_LEVEL=0 \
-"
-EXTRA_OEMAKE:append:imx8mq-lpddr4-wevk = " \
+EXTRA_OEMAKE += " \
-    CFG_CORE_LARGE_PHYS_ADDR=y \
+    PLATFORM=${OPTEEMACHINE} \
-    CFG_CORE_ARM64_PA_BITS=36 \
+    CFG_${OPTEE_CORE}_core=y \
-    CFG_DDR_SIZE=0x100000000 \
+    CROSS_COMPILE_core=${HOST_PREFIX} \
-    CFG_TZDRAM_START=0xfe000000 \
+    CROSS_COMPILE_ta_${OPTEE_ARCH}=${HOST_PREFIX} \
+    NOWERROR=1 \
+    ta-targets=ta_${OPTEE_ARCH} \
+    O=${B} \
 "
+EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}"
+EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}"
 LDFLAGS[unexport] = "1"
 CPPFLAGS[unexport] = "1"
 AS[unexport] = "1"
 LD[unexport] = "1"
-do_configure[noexec] = "1"
 do_compile:prepend() {
-    PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name)
+        PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name)
 }
-do_compile:arm () {
+do_compile() {
-    oe_runmake all uTee
+    oe_runmake -C ${S} all
-}
-do_compile:aarch64 () {
-    oe_runmake all
 }
 do_compile[cleandirs] = "${B}"
-do_deploy () {
+do_install() {
-    install -d ${DEPLOYDIR}
+    #install core in firmware
-    cp ${B}/core/tee-raw.bin ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin
+    install -d ${D}${nonarch_base_libdir}/firmware/
-    ln -sf tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/tee.bin
+    install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/
-}
-do_deploy:append:arm () {
+    #install tas in optee_armtz
-    cp ${B}/core/uTee ${DEPLOYDIR}/uTee-${OPTEE_BIN_EXT}
+    install -d ${D}${nonarch_base_libdir}/optee_armtz/
+    install -m 444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz
 }
-do_install () {
+PACKAGE_ARCH = "${MACHINE_ARCH}"
-    install -d ${D}${nonarch_base_libdir}/firmware/
-    install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
-    # Install embedded TAs
+do_deploy() {
-    install -d ${D}${nonarch_base_libdir}/optee_armtz/
+    install -d ${DEPLOYDIR}/${MLPREFIX}optee
-    install -m 444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
+    install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/${MLPREFIX}optee
-    # Install the TA devkit
+    install -d ${DEPLOYDIR}/${MLPREFIX}optee/ta
-    install -d ${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
+    install -m 644 ${B}/ta/*/*.elf ${DEPLOYDIR}/${MLPREFIX}optee/ta
-    cp -aR ${B}/export-ta_${OPTEE_ARCH}/* \
-        ${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
 }
-addtask deploy after do_compile before do_install
+addtask deploy before do_build after do_install
-FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/"
+SYSROOT_DIRS += "${nonarch_base_libdir}/firmware"
-FILES:${PN}-staticdev = "${includedir}/optee/"
-RDEPENDS:${PN}-dev += "${PN}-staticdev"
+PACKAGES += "${PN}-ta"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/"
+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"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
new file mode 100644
index 000000000..18cf9a374
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
@@ -0,0 +1,27 @@
+# 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
+require optee-os-common-fslc-imx.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"
+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/"
+# 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
new file mode 100644
index 000000000..bb2e2cf6b
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os-tadevkit_4.4.0.imx.bb
@@ -0,0 +1,4 @@
+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/0001-core-Define-section-attributes-for-clang.patch b/recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch
deleted file mode 100644
index 54fbe5419..000000000
--- a/recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From ef83625c9a5f50610e25aa860c4b9c5e64723a66 Mon Sep 17 00:00:00 2001
-From: Emekcan Aras <emekcan.aras@arm.com>
-Date: Wed, 21 Dec 2022 10:55:58 +0000
-Subject: [PATCH 1/4] core: Define section attributes for clang
-Clang's attribute section is not same as gcc, here we need to add flags
-to sections so they can be eventually collected by linker into final
-output segments. Only way to do so with clang is to use
-pragma clang section ...
-The behavious is described here [1], this allows us to define names bss
-sections. This was not an issue until clang-15 where LLD linker starts
-to detect the section flags before merging them and throws the following
-errors
-| ld.lld: error: section type mismatch for .nozi.kdata_page
-| >>> /mnt/b/yoe/master/build/tmp/work/qemuarm64-yoe-linux/optee-os-tadevkit/3.17.0-r0/build/core/arch/arm/kernel/thread.o:(.nozi.kdata_page): SHT_PROGBITS
-| >>> output section .nozi: SHT_NOBITS
-|
-| ld.lld: error: section type mismatch for .nozi.mmu.l2
-| >>> /mnt/b/yoe/master/build/tmp/work/qemuarm64-yoe-linux/optee-os-tadevkit/3.17.0-r0/build/core/arch/arm/mm/core_mmu_lpae.o:(.nozi.mmu.l2): SHT_PROGBITS
-| >>> output section .nozi: SHT_NOBITS
-These sections should be carrying SHT_NOBITS but so far it was not
-possible to do so, this patch tries to use clangs pragma to get this
-going and match the functionality with gcc.
-[1] https://intel.github.io/llvm-docs/clang/LanguageExtensions.html#specifying-section-names-for-global-objects-pragma-clang-section
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
- core/arch/arm/kernel/thread.c    | 19 +++++++++++++++--
- core/arch/arm/mm/core_mmu_lpae.c | 35 +++++++++++++++++++++++++++----
- core/arch/arm/mm/core_mmu_v7.c   | 36 +++++++++++++++++++++++++++++---
- core/kernel/thread.c             | 13 +++++++++++-
- core/mm/pgt_cache.c              | 12 ++++++++++-
- 5 files changed, 104 insertions(+), 11 deletions(-)
-diff --git a/core/arch/arm/kernel/thread.c b/core/arch/arm/kernel/thread.c
-index 66833b3a0..b3eb9cf9a 100644
--- a/core/arch/arm/kernel/thread.c
-+++ b/core/arch/arm/kernel/thread.c
-@@ -45,15 +45,30 @@ static size_t thread_user_kcode_size __nex_bss;
- #if defined(CFG_CORE_UNMAP_CORE_AT_EL0) && \
-        defined(CFG_CORE_WORKAROUND_SPECTRE_BP_SEC) && defined(ARM64)
- long thread_user_kdata_sp_offset __nex_bss;
-+#ifdef __clang__
-+#ifndef CFG_VIRTUALIZATION
-+#pragma clang section bss=".nozi.kdata_page"
-+#else
-+#pragma clang section bss=".nex_nozi.kdata_page"
-+#endif
-+#endif
- static uint8_t thread_user_kdata_page[
-        ROUNDUP(sizeof(struct thread_core_local) * CFG_TEE_CORE_NB_CORE,
-                SMALL_PAGE_SIZE)]
-        __aligned(SMALL_PAGE_SIZE)
-+#ifndef __clang__
- #ifndef CFG_NS_VIRTUALIZATION
-       __section(".nozi.kdata_page");
-+       __section(".nozi.kdata_page")
- #else
-       __section(".nex_nozi.kdata_page");
-+       __section(".nex_nozi.kdata_page")
- #endif
-+#endif
-+    ;
-+#endif
-+
-+/* reset BSS section to default ( .bss ) */
-+#ifdef __clang__
-+#pragma clang section bss=""
- #endif
- 
- #ifdef ARM32
-diff --git a/core/arch/arm/mm/core_mmu_lpae.c b/core/arch/arm/mm/core_mmu_lpae.c
-index 4c8b85e39..1885e1d3f 100644
--- a/core/arch/arm/mm/core_mmu_lpae.c
-+++ b/core/arch/arm/mm/core_mmu_lpae.c
-@@ -234,19 +234,46 @@ typedef uint16_t l1_idx_t;
- typedef uint64_t base_xlat_tbls_t[CFG_TEE_CORE_NB_CORE][NUM_BASE_LEVEL_ENTRIES];
- typedef uint64_t xlat_tbl_t[XLAT_TABLE_ENTRIES];
- 
-+#ifdef __clang__
-+#pragma clang section bss=".nozi.mmu.base_table"
-+#endif
- static base_xlat_tbls_t base_xlation_table[NUM_BASE_TABLES]
-        __aligned(NUM_BASE_LEVEL_ENTRIES * XLAT_ENTRY_SIZE)
-       __section(".nozi.mmu.base_table");
-+#ifndef __clang__
-+       __section(".nozi.mmu.base_table")
-+#endif
-+;
-+#ifdef __clang__
-+#pragma clang section bss=""
-+#endif
- 
-+#ifdef __clang__
-+#pragma clang section bss=".nozi.mmu.l2"
-+#endif
- static xlat_tbl_t xlat_tables[MAX_XLAT_TABLES]
-       __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2");
-+       __aligned(XLAT_TABLE_SIZE)
-+#ifndef __clang__
-+       __section(".nozi.mmu.l2")
-+#endif
-+;
-+#ifdef __clang__
-+#pragma clang section bss=""
-+#endif
- 
- #define XLAT_TABLES_SIZE       (sizeof(xlat_tbl_t) * MAX_XLAT_TABLES)
- 
-+#ifdef __clang__
-+#pragma clang section bss=".nozi.mmu.l2"
-+#endif
- /* MMU L2 table for TAs, one for each thread */
- static xlat_tbl_t xlat_tables_ul1[CFG_NUM_THREADS]
-       __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2");
-
-+#ifndef __clang__
-+       __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2")
-+#endif
-+;
-+#ifdef __clang__
-+#pragma clang section bss=""
-+#endif
- /*
-  * TAs page table entry inside a level 1 page table.
-  *
-diff --git a/core/arch/arm/mm/core_mmu_v7.c b/core/arch/arm/mm/core_mmu_v7.c
-index 61e703da8..1960c08ca 100644
--- a/core/arch/arm/mm/core_mmu_v7.c
-+++ b/core/arch/arm/mm/core_mmu_v7.c
-@@ -204,16 +204,46 @@ typedef uint32_t l1_xlat_tbl_t[NUM_L1_ENTRIES];
- typedef uint32_t l2_xlat_tbl_t[NUM_L2_ENTRIES];
- typedef uint32_t ul1_xlat_tbl_t[NUM_UL1_ENTRIES];
- 
-+#ifdef __clang__
-+#pragma clang section bss=".nozi.mmu.l1"
-+#endif
- static l1_xlat_tbl_t main_mmu_l1_ttb
-               __aligned(L1_ALIGNMENT) __section(".nozi.mmu.l1");
-+               __aligned(L1_ALIGNMENT)
-+#ifndef __clang__
-+       __section(".nozi.mmu.l1")
-+#endif
-+;
-+#ifdef __clang__
-+#pragma clang section bss=""
-+#endif
- 
- /* L2 MMU tables */
-+#ifdef __clang__
-+#pragma clang section bss=".nozi.mmu.l2"
-+#endif
- static l2_xlat_tbl_t main_mmu_l2_ttb[MAX_XLAT_TABLES]
-               __aligned(L2_ALIGNMENT) __section(".nozi.mmu.l2");
-+               __aligned(L2_ALIGNMENT)
-+#ifndef __clang__
-+       __section(".nozi.mmu.l2")
-+#endif
-+;
-+#ifdef __clang__
-+#pragma clang section bss=""
-+#endif
- 
- /* MMU L1 table for TAs, one for each thread */
-+#ifdef __clang__
-+#pragma clang section bss=".nozi.mmu.ul1"
-+#endif
- static ul1_xlat_tbl_t main_mmu_ul1_ttb[CFG_NUM_THREADS]
-               __aligned(UL1_ALIGNMENT) __section(".nozi.mmu.ul1");
-+               __aligned(UL1_ALIGNMENT)
-+#ifndef __clang__
-+       __section(".nozi.mmu.ul1")
-+#endif
-+;
-+#ifdef __clang__
-+#pragma clang section bss=""
-+#endif
- 
- struct mmu_partition {
-        l1_xlat_tbl_t *l1_table;
-diff --git a/core/kernel/thread.c b/core/kernel/thread.c
-index 2a1f22dce..5516b6771 100644
--- a/core/kernel/thread.c
-+++ b/core/kernel/thread.c
-@@ -39,13 +39,24 @@ static uint32_t end_canary_value = 0xababab00;
-        name[stack_num][sizeof(name[stack_num]) / sizeof(uint32_t) - 1]
- #endif
- 
-+#define DO_PRAGMA(x) _Pragma (#x)
-+
-+#ifdef __clang__
-+#define DECLARE_STACK(name, num_stacks, stack_size, linkage) \
-+DO_PRAGMA (clang section bss=".nozi_stack." #name) \
-+linkage uint32_t name[num_stacks] \
-+               [ROUNDUP(stack_size + STACK_CANARY_SIZE + STACK_CHECK_EXTRA, \
-+                        STACK_ALIGNMENT) / sizeof(uint32_t)] \
-+               __attribute__((aligned(STACK_ALIGNMENT))); \
-+DO_PRAGMA(clang section bss="")
-+#else
- #define DECLARE_STACK(name, num_stacks, stack_size, linkage) \
- linkage uint32_t name[num_stacks] \
-                [ROUNDUP(stack_size + STACK_CANARY_SIZE + STACK_CHECK_EXTRA, \
-                         STACK_ALIGNMENT) / sizeof(uint32_t)] \
-                __attribute__((section(".nozi_stack." # name), \
-                               aligned(STACK_ALIGNMENT)))
-
-+#endif
- #define GET_STACK(stack) ((vaddr_t)(stack) + STACK_SIZE(stack))
- 
- DECLARE_STACK(stack_tmp, CFG_TEE_CORE_NB_CORE, STACK_TMP_SIZE,
-diff --git a/core/mm/pgt_cache.c b/core/mm/pgt_cache.c
-index 79553c6d2..b9efdf427 100644
--- a/core/mm/pgt_cache.c
-+++ b/core/mm/pgt_cache.c
-@@ -410,8 +410,18 @@ void pgt_init(void)
-         * has a large alignment, while .bss has a small alignment. The current
-         * link script is optimized for small alignment in .bss
-         */
-+#ifdef __clang__
-+#pragma clang section bss=".nozi.mmu.l2"
-+#endif
-        static uint8_t pgt_tables[PGT_CACHE_SIZE][PGT_SIZE]
-                       __aligned(PGT_SIZE) __section(".nozi.pgt_cache");
-+                       __aligned(PGT_SIZE)
-+#ifndef __clang__
-+                       __section(".nozi.pgt_cache")
-+#endif
-+                       ;
-+#ifdef __clang__
-+#pragma clang section bss=""
-+#endif
-        size_t n;
- 
-        for (n = 0; n < ARRAY_SIZE(pgt_tables); n++) {
-- 
-2.43.2
diff --git a/recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch b/recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch
deleted file mode 100644
index 1c5753c7f..000000000
--- a/recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 6f738803a59613ec4a683ddbc1747ebffd75a4e6 Mon Sep 17 00:00:00 2001
-From: Jerome Forissier <jerome.forissier@linaro.org>
-Date: Tue, 23 Aug 2022 12:31:46 +0000
-Subject: [PATCH 3/4] arm32: libutils, libutee, ta: add .note.GNU-stack section
- to
- .S files
-When building for arm32 with GNU binutils 2.39, the linker outputs
-warnings when linking Trusted Applications:
- arm-unknown-linux-uclibcgnueabihf-ld.bfd: warning: utee_syscalls_a32.o: missing .note.GNU-stack section implies executable stack
- arm-unknown-linux-uclibcgnueabihf-ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
-We could silence the warning by adding the '-z execstack' option to the
-TA link flags, like we did in the parent commit for the TEE core and
-ldelf. Indeed, ldelf always allocates a non-executable piece of memory
-for the TA to use as a stack.
-However it seems preferable to comply with the common ELF practices in
-this case. A better fix is therefore to add the missing .note.GNU-stack
-sections in the assembler files.
-Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
-Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
-Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/5499]
-Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
- lib/libutee/arch/arm/utee_syscalls_a32.S             | 2 ++
- lib/libutils/ext/arch/arm/atomic_a32.S               | 2 ++
- lib/libutils/ext/arch/arm/mcount_a32.S               | 2 ++
- lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S  | 2 ++
- lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S | 2 ++
- lib/libutils/isoc/arch/arm/setjmp_a32.S              | 2 ++
- ta/arch/arm/ta_entry_a32.S                           | 2 ++
- 7 files changed, 14 insertions(+)
-diff --git a/lib/libutee/arch/arm/utee_syscalls_a32.S b/lib/libutee/arch/arm/utee_syscalls_a32.S
-index 2dea83ab8..668b65a86 100644
--- a/lib/libutee/arch/arm/utee_syscalls_a32.S
-+++ b/lib/libutee/arch/arm/utee_syscalls_a32.S
-@@ -9,6 +9,8 @@
- 
-        .section .note.GNU-stack,"",%progbits
- 
-+       .section .note.GNU-stack,"",%progbits
-+
-         .section .text
-         .balign 4
-         .code 32
-diff --git a/lib/libutils/ext/arch/arm/atomic_a32.S b/lib/libutils/ext/arch/arm/atomic_a32.S
-index 2be73ffad..87ddf1065 100644
--- a/lib/libutils/ext/arch/arm/atomic_a32.S
-+++ b/lib/libutils/ext/arch/arm/atomic_a32.S
-@@ -7,6 +7,8 @@
- 
-        .section .note.GNU-stack,"",%progbits
- 
-+       .section .note.GNU-stack,"",%progbits
-+
- /* uint32_t atomic_inc32(uint32_t *v); */
- FUNC atomic_inc32 , :
-        ldrex   r1, [r0]
-diff --git a/lib/libutils/ext/arch/arm/mcount_a32.S b/lib/libutils/ext/arch/arm/mcount_a32.S
-index 54dc3c02d..2f24632b8 100644
--- a/lib/libutils/ext/arch/arm/mcount_a32.S
-+++ b/lib/libutils/ext/arch/arm/mcount_a32.S
-@@ -9,6 +9,8 @@
- 
-        .section .note.GNU-stack,"",%progbits
- 
-+       .section .note.GNU-stack,"",%progbits
-+
- /*
-  * Convert return address to call site address by subtracting the size of the
-  * mcount call instruction (blx __gnu_mcount_nc).
-diff --git a/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S b/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S
-index 37ae9ec6f..bc6c48b1a 100644
--- a/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S
-+++ b/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S
-@@ -7,6 +7,8 @@
- 
-        .section .note.GNU-stack,"",%progbits
- 
-+       .section .note.GNU-stack,"",%progbits
-+
- /*
-  * signed ret_idivmod_values(signed quot, signed rem);
-  * return quotient and remaining the EABI way (regs r0,r1)
-diff --git a/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S b/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S
-index 5c3353e2c..9fb5e0283 100644
--- a/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S
-+++ b/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S
-@@ -7,6 +7,8 @@
- 
-        .section .note.GNU-stack,"",%progbits
- 
-+       .section .note.GNU-stack,"",%progbits
-+
- /*
-  * __value_in_regs lldiv_t __aeabi_ldivmod( long long n, long long d)
-  */
-diff --git a/lib/libutils/isoc/arch/arm/setjmp_a32.S b/lib/libutils/isoc/arch/arm/setjmp_a32.S
-index f8a0b70df..37d7cb88e 100644
--- a/lib/libutils/isoc/arch/arm/setjmp_a32.S
-+++ b/lib/libutils/isoc/arch/arm/setjmp_a32.S
-@@ -53,6 +53,8 @@
- 
-        .section .note.GNU-stack,"",%progbits
- 
-+       .section .note.GNU-stack,"",%progbits
-+
- /* Arm/Thumb interworking support:
- 
-    The interworking scheme expects functions to use a BX instruction
-diff --git a/ta/arch/arm/ta_entry_a32.S b/ta/arch/arm/ta_entry_a32.S
-index cd9a12f9d..ccdc19928 100644
--- a/ta/arch/arm/ta_entry_a32.S
-+++ b/ta/arch/arm/ta_entry_a32.S
-@@ -7,6 +7,8 @@
- 
-        .section .note.GNU-stack,"",%progbits
- 
-+       .section .note.GNU-stack,"",%progbits
-+
- /*
-  * This function is the bottom of the user call stack. Mark it as such so that
-  * the unwinding code won't try to go further down.
-- 
-2.43.2
diff --git a/recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch b/recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch
deleted file mode 100644
index f32b2284f..000000000
--- a/recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From a63f82f74e015eb662242cdb51ef814e3f576829 Mon Sep 17 00:00:00 2001
-From: Jerome Forissier <jerome.forissier@linaro.org>
-Date: Fri, 5 Aug 2022 09:48:03 +0200
-Subject: [PATCH 4/4] core: link: add --no-warn-rwx-segments
-Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
-Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/5474]
-binutils ld.bfd generates one RWX LOAD segment by merging several sections
-with mixed R/W/X attributes (.text, .rodata, .data). After version 2.38 it
-also warns by default when that happens [1], which breaks the build due to
--fatal-warnings. The RWX segment is not a problem for the TEE core, since
-that information is not used to set memory permissions. Therefore, silence
-the warning.
-Link: [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
-Link: https://sourceware.org/bugzilla/show_bug.cgi?id=29448
-Reported-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
-Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
-Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
-Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
- core/arch/arm/kernel/link.mk | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk
-index 49e9f4fa1..9e1cc172f 100644
--- a/core/arch/arm/kernel/link.mk
-+++ b/core/arch/arm/kernel/link.mk
-@@ -37,6 +37,7 @@ link-ldflags += --sort-section=alignment
- link-ldflags += --fatal-warnings
- link-ldflags += --gc-sections
- link-ldflags += $(link-ldflags-common)
-+link-ldflags += $(call ld-option,--no-warn-rwx-segments)
- 
- link-ldadd  = $(LDADD)
- link-ldadd += $(ldflags-external)
-@@ -61,6 +62,7 @@ link-script-cppflags := \
-                $(cppflagscore))
- 
- ldargs-all_objs := -T $(link-script-dummy) --no-check-sections \
-+                  $(call ld-option,--no-warn-rwx-segments) \
-                   $(link-ldflags-common) \
-                   $(link-objs) $(link-ldadd) $(libgcccore)
- cleanfiles += $(link-out-dir)/all_objs.o
-@@ -75,7 +77,7 @@ $(link-out-dir)/unpaged_entries.txt: $(link-out-dir)/all_objs.o
-                $(AWK) '/ ____keep_pager/ { printf "-u%s ", $$3 }' > $@
- 
- unpaged-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \
-                $(link-ldflags-common)
-+                $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments)
- unpaged-ldadd := $(objs) $(link-ldadd) $(libgcccore)
- cleanfiles += $(link-out-dir)/unpaged.o
- $(link-out-dir)/unpaged.o: $(link-out-dir)/unpaged_entries.txt
-@@ -104,7 +106,7 @@ $(link-out-dir)/init_entries.txt: $(link-out-dir)/all_objs.o
-                $(AWK) '/ ____keep_init/ { printf "-u%s ", $$3 }' > $@
- 
- init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \
-              $(link-ldflags-common)
-+              $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments)
- init-ldadd := $(link-objs-init) $(link-out-dir)/version.o  $(link-ldadd) \
-              $(libgcccore)
- cleanfiles += $(link-out-dir)/init.o
-- 
-2.43.2
diff --git a/recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch b/recipes-security/optee-imx/optee-os/0007-allow-setting-sysroot-for-clang.patch
index dbc53542e..067ba6ebf 100644
--- a/recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch
+++ b/recipes-security/optee-imx/optee-os/0007-allow-setting-sysroot-for-clang.patch
@@ -1,7 +1,7 @@
-From 2ba573c9763329fbfdfacc8393d565ab747cac4d Mon Sep 17 00:00:00 2001
+From db9e44af75c7cfd3316cab15aaa387383df3e57e Mon Sep 17 00:00:00 2001
 From: Brett Warren <brett.warren@arm.com>
 Date: Wed, 23 Sep 2020 09:27:34 +0100
-Subject: [PATCH 2/4] optee: enable clang support
+Subject: [PATCH] optee: enable clang support
 When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
 to provide a sysroot wasn't included, which results in not locating
@@ -10,17 +10,16 @@ compiler-rt. This is mitigated by including the variable as ammended.
 Upstream-Status: Pending
 ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
 Signed-off-by: Brett Warren <brett.warren@arm.com>
-Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
+---
 mk/clang.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/mk/clang.mk b/mk/clang.mk
-index a045beee8..1ebe2f702 100644
+index c141a3f2..7d067cc0 100644
 --- a/mk/clang.mk
 +++ b/mk/clang.mk
-@@ -30,7 +30,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
+@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
 
 # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
 # libgcc for clang
@@ -29,6 +28,3 @@ index a045beee8..1ebe2f702 100644
                        -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
 
 # Core ASLR relies on the executable being ready to run from its preferred load
-- 
-2.43.2
diff --git a/recipes-security/optee-imx/optee-os_4.0.0.imx.bb b/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
deleted file mode 100644
index ad6c6b406..000000000
--- a/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2017-2021 NXP
-require optee-os-fslc-imx.inc
-SRC_URI += " \
-    file://0001-core-Define-section-attributes-for-clang.patch \
-    file://0002-optee-enable-clang-support.patch \
-    file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \
-    file://0004-core-link-add-no-warn-rwx-segments.patch \
-"
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "e0a3e77735941e6057a1994a576b83a93ea0bdb9"
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
new file mode 100644
index 000000000..dc6d3901d
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os_4.4.0.imx.bb
@@ -0,0 +1,6 @@
+# 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-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc
new file mode 100644
index 000000000..ab16fd221
--- /dev/null
+++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc
@@ -0,0 +1,18 @@
+# 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
+require optee-test-fslc.inc
+DEPENDS += "openssl"
+FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
+SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
+SRC_URI:prepend = "${OPTEE_TEST_SRC};branch=${SRCBRANCH} "
+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"
+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 e0c133a7c..ed64c87f8 100644
--- a/recipes-security/optee-imx/optee-test-fslc.inc
+++ b/recipes-security/optee-imx/optee-test-fslc.inc
@@ -1,38 +1,64 @@
-# Copyright (C) 2017-2021 NXP
+# 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
+SUMMARY = "OP-TEE sanity testsuite"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
+HOMEPAGE = "https://www.op-tee.org/"
-SUMMARY = "OPTEE test"
 LICENSE = "BSD-2-Clause & GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
+inherit python3native ptest
+inherit deploy
 require optee-fslc.inc
-DEPENDS += "optee-os optee-client openssl"
+DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native openssl"
+SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
+           file://run-ptest \
+          "
+B = "${WORKDIR}/build"
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
-    TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta_${OPTEE_ARCH}/ \
+                 OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR} \
-    CROSS_COMPILE_HOST=${HOST_PREFIX} \
+                 CROSS_COMPILE_HOST=${HOST_PREFIX} \
-    CROSS_COMPILE_TA=${HOST_PREFIX} \
+                 CROSS_COMPILE_TA=${HOST_PREFIX} \
-    CROSS_COMPILE=${HOST_PREFIX} \
+                 O=${B} \
-"
+               "
+CFLAGS += "-Wno-error=deprecated-declarations"
 do_compile() {
-    oe_runmake all
+    cd ${S}
+    # Top level makefile doesn't seem to handle parallel make gracefully
+    oe_runmake xtest
+    oe_runmake ta
+    oe_runmake test_plugin
 }
 do_compile[cleandirs] = "${B}"
 do_install () {
-        install -d ${D}${bindir}
+    install -D -p -m0755 ${B}/xtest/xtest ${D}${bindir}/xtest
-        install ${B}/xtest/xtest ${D}${bindir}
-        install -d ${D}${nonarch_base_libdir}/optee_armtz
+    # install path should match the value set in optee-client/tee-supplicant
-        find ${B}/ta -name '*.ta' | while read name; do
+    # default TEEC_LOAD_PATH is /lib
-                install -m 444 $name ${D}${nonarch_base_libdir}/optee_armtz/
+    mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/
-        done
+    install -D -p -m0444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
+    mkdir -p ${D}${libdir}/tee-supplicant/plugins
+    install -D -p -m0444 ${B}/supp_plugin/*.plugin ${D}${libdir}/tee-supplicant/plugins/
+}
-        install -d ${D}${libdir}/tee-supplicant/plugins/
+do_deploy () {
-        install ${B}/supp_plugin/*plugin ${D}${libdir}/tee-supplicant/plugins/
+    install -d ${DEPLOYDIR}/${MLPREFIX}optee/ta
+    install -m 644 ${B}/ta/*/*.elf ${DEPLOYDIR}/${MLPREFIX}optee/ta
 }
-FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ ${libdir}/tee-supplicant/plugins/"
+addtask deploy before do_build after do_install
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ \
+                ${libdir}/tee-supplicant/plugins/ \
+               "
-RDEPENDS:${PN} = "optee-os"
+# Imports machine specific configs from staging to build
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee-imx/optee-test/run-ptest b/recipes-security/optee-imx/optee-test/run-ptest
new file mode 100644
index 000000000..ba88c14d3
--- /dev/null
+++ b/recipes-security/optee-imx/optee-test/run-ptest
@@ -0,0 +1,52 @@
+#!/bin/sh
+xtest | awk '
+    # Escapes the special characters in a string so that, when
+    # included in a regex, it represents a literal match
+    function regx_escape_literal(str,    ret) {
+        ret = str
+        gsub(/[\[\]\^\$\.\*\?\+\{\}\\\(\)\|]/ , "\\\\&", str)
+        return str
+    }
+    # Returns the simple test formatted name
+    function name(n,    ret) {
+        ret = n
+        gsub(/\./, " ", ret)
+        return ret
+    }
+    # Returns the simple test formatted result
+    function result(res) {
+        if(res ~ /OK/) {
+            return "PASS"
+        } else if(res ~ /FAILED/) {
+            return "FAIL"
+        }
+    }
+    function parse(name, description,     has_subtests, result_line) {
+        has_subtests = 0
+        # Consume every line up to the result line
+        result_line = "  " regx_escape_literal(name) " (OK|FAILED)"
+        do {
+            getline
+            # If this is a subtest (denoted by an "o" bullet) then subparse
+            if($0 ~ /^o /) {
+                parse($2, description " : " substr($0, index($0, $3)))
+                has_subtests = 1
+            }
+        } while ($0 !~ result_line)
+        # Only print the results for the deepest nested subtests
+        if(!has_subtests) {
+            print result($2) ": " name(name) " - " description
+        }
+    }
+    # Start parsing at the beginning of every test (denoted by a "*" bullet)
+    /^\* / { parse($2, substr($0, index($0, $3))) }
+'
diff --git a/recipes-security/optee-imx/optee-test_4.0.0.imx.bb b/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
deleted file mode 100644
index 1717a713f..000000000
--- a/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2017-2021 NXP
-require optee-test-fslc.inc
-SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "95c49d950f50fa774e4530d19a967079b3b61279"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-test_4.4.0.imx.bb b/recipes-security/optee-imx/optee-test_4.4.0.imx.bb
new file mode 100644
index 000000000..b4ac12714
--- /dev/null
+++ b/recipes-security/optee-imx/optee-test_4.4.0.imx.bb
@@ -0,0 +1,13 @@
+# Copyright 2017-2024 NXP
+require optee-test-fslc-imx.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"
+SRCBRANCH = "lf-6.6.52_2.2.0"
+SRCREV = "dafc98ed8364d7281a9a7f0788dd0a2067844a59"
diff --git a/recipes-security/optee-qoriq/optee-client.nxp.inc b/recipes-security/optee-qoriq/optee-client.nxp.inc
index a7d34497e..a7e51a29d 100644
--- a/recipes-security/optee-qoriq/optee-client.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-client.nxp.inc
@@ -13,7 +13,6 @@ SRCREV = "7c9c423d00e96bf51debd5fe10fd70dce83be5cc"
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-client:"
 SRC_URI += "file://tee-supplicant.service"
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 OPTEE_ARCH ?= "arm32"
@@ -41,7 +40,7 @@ do_install () {
        cp -a ${B}/export/usr/include ${D}${includedir}
        install -d ${D}${systemd_system_unitdir}/
-        install -m0644 ${WORKDIR}/tee-supplicant.service ${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
 }
diff --git a/recipes-security/optee-qoriq/optee-os.nxp.inc b/recipes-security/optee-qoriq/optee-os.nxp.inc
index 5b90b937c..989da06d7 100644
--- a/recipes-security/optee-qoriq/optee-os.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-os.nxp.inc
@@ -12,7 +12,6 @@ DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-pycrypt
 SRC_URI = "git://github.com/nxp-qoriq/optee_os.git;protocol=https;nobranch=1"
 SRCREV = "735d98806dc26fbeeecad7f5e60ffeab8170c67e"
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build.${PLATFORM_FLAVOR}"
 PLATFORM_FLAVOR ?= "${MACHINE}"
diff --git a/recipes-security/optee-qoriq/optee-test.nxp.inc b/recipes-security/optee-qoriq/optee-test.nxp.inc
index 14a42ac5a..17108ff38 100644
--- a/recipes-security/optee-qoriq/optee-test.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-test.nxp.inc
@@ -12,7 +12,6 @@ inherit python3native cmake
 SRC_URI = "git://github.com/nxp-qoriq/optee_test.git;protocol=https;nobranch=1"
 SRCREV = "69722dab8c1f2683e30e0ee3b536053367e37aad"
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 TA_DEV_KIT_DIR ?= "${STAGING_INCDIR}/optee/export-user_ta"
diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb
index 25a5f656a..66ff7ecb0 100644
--- a/recipes-security/smw/keyctl-caam_git.bb
+++ b/recipes-security/smw/keyctl-caam_git.bb
@@ -11,8 +11,6 @@ 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 () {
diff --git a/recipes-security/smw/smw_git.bb b/recipes-security/smw/smw_git.bb
index 3f77ad06b..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
@@ -35,7 +35,7 @@ OPTEE_OS_TA_EXPORT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64"
 OPTEE_OS_TA_EXPORT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32"
 # Needs to sign OPTEE TAs
-export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+export OPENSSL_MODULES = "${STAGING_LIBDIR_NATIVE}/ossl-modules"
 EXTRA_OECMAKE = " \
    -DTA_DEV_KIT_ROOT=${OPTEE_OS_TA_EXPORT_DIR} \
diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb
index 6d13d107a..8a0ca2c1f 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}
@@ -145,7 +143,7 @@ PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtu
 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,"
-PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy,"
+PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/_core/include,,python3-numpy,"
 PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
 PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
 PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,,"
@@ -158,11 +156,11 @@ inherit pkgconfig cmake
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)}
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)}
-export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
+export PYTHON_CSPEC = "-I${STAGING_INCDIR}/${PYTHON_DIR}"
-export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}"
+export PYTHON = "${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}"
-export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java"
+export ORACLE_JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/bin/java"
-export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native"
+export JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native"
-export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/"
+export ANT_DIR = "${STAGING_DIR_NATIVE}/usr/share/ant/"
 TARGET_CC_ARCH += "-I${S}/include "
@@ -268,7 +266,7 @@ SRCREV_opencv = "d3440df40a6e90cd1d2a1b729bcbc16aa4d42f5d"
 # Add opencv_extra
 SRC_URI += " \
    git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \
-    file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \
+    file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=${UNPACKDIR}/extra \
 "
 SRCREV_FORMAT:append = "_extra"
 SRCREV_extra = "936854e2b666853d6d0732a8eabc2d699f4fa3d8"
@@ -293,7 +291,7 @@ PACKAGECONFIG_OPENCL:mx8mnul-nxp-bsp = ""
 PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx,"
 PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native,"
 PACKAGECONFIG[qt6] = "-DWITH_QT=ON -DQT_HOST_PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native},-DWITH_QT=OFF,qtbase qtbase-native,"
-PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF,"
+PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${UNPACKDIR}/extra/testdata, -DINSTALL_TESTS=OFF,"
 PACKAGECONFIG[tim-vx] = "-DWITH_TIMVX=ON -DTIMVX_INSTALL_DIR=${STAGING_DIR_HOST}${libdir},-DWITH_TIMVX=OFF,tim-vx"
 # Disable cvv module in opencv_contrib as it is not yet suppported for Qt6
@@ -302,10 +300,12 @@ EXTRA_OECMAKE:append = " -DBUILD_opencv_cvv=OFF"
 do_install:append() {
    ln -sf opencv4/opencv2 ${D}${includedir}/opencv2
-    install -d ${D}${datadir}/OpenCV/samples/data
+    if ${@bb.utils.contains('PACKAGECONFIG', 'samples', 'true', 'false', d)}; then
-    cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data
+        install -d ${D}${datadir}/OpenCV/samples/data
-    install -d ${D}${datadir}/OpenCV/samples/bin/
+        cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data
-    cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/
+        install -d ${D}${datadir}/OpenCV/samples/bin/
+        cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/
+    fi
    if ${@bb.utils.contains('PACKAGECONFIG', 'tests-imx', 'true', 'false', d)}; then
        cp -r share/opencv4/testdata/cv/face/* ${D}${datadir}/opencv4/testdata/cv/face/
    fi
diff --git a/scripts/generate-license-file b/scripts/generate-license-file
new file mode 100755
index 000000000..02b45ab30
--- /dev/null
+++ b/scripts/generate-license-file
@@ -0,0 +1,20 @@
+#!/bin/bash
+export LC_ALL=C
+# Create or clear the LICENSE file
+echo "# License Information" > LICENSE
+echo "" >> LICENSE
+echo "This file lists all licenses used by recipes in the meta-freescale layer." >> LICENSE
+echo "" >> LICENSE
+# Find all .bb and .inc files and extract license information
+find . -type f \( -name "*.bb" -o -name "*.inc" \) | sort | while read -r file; do
+    # Extract the license line from each recipe file, if it exists
+    license_line=$(grep -i "^LICENSE" "$file")
+    if [ -n "$license_line" ]; then
+        echo "$file: $license_line" >> LICENSE
+    fi
+done
+echo "LICENSE file has been generated and updated with current recipe licenses."
diff --git a/wic/imx-imx-boot-bootpart.wks.in b/wic/imx-imx-boot-bootpart.wks.in
index b50364d1b..46a2a0a68 100644
--- a/wic/imx-imx-boot-bootpart.wks.in
+++ b/wic/imx-imx-boot-bootpart.wks.in
@@ -10,11 +10,11 @@
 #  - ---------- -------------- --------------
 # ^ ^          ^              ^              ^
 # | |          |              |              |
-# 0 |        8MiB          72MiB          72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+# 0 |        8MiB          264MiB         264MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #   ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
 #
-part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
+part u-boot --source rawcopy --sourceparams="file=imx-boot.tagged" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --fixed-size 256
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192
 bootloader --ptable msdos
diff --git a/wic/imx-imx-boot.wks.in b/wic/imx-imx-boot.wks.in
index 8e78b5e35..fdb411803 100644
--- a/wic/imx-imx-boot.wks.in
+++ b/wic/imx-imx-boot.wks.in
@@ -13,7 +13,7 @@
 # 0 |        8MiB            8MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #   ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
 #
-part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
+part u-boot --source rawcopy --sourceparams="file=imx-boot.tagged" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192
 bootloader --ptable msdos
diff --git a/wic/imx-uboot-bootpart.wks.in b/wic/imx-uboot-bootpart.wks.in
index 8fe019c01..4959d02df 100644
--- a/wic/imx-uboot-bootpart.wks.in
+++ b/wic/imx-uboot-bootpart.wks.in
@@ -12,7 +12,7 @@
 # | |         |              |
 # 0 1kiB    4MiB          16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #
-part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 1
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}.tagged" --ondisk mmcblk --no-table --align 1
 part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/wic/imx-uboot-spl-bootpart.wks.in b/wic/imx-uboot-spl-bootpart.wks.in
index 8062c51e6..be0f0fe03 100644
--- a/wic/imx-uboot-spl-bootpart.wks.in
+++ b/wic/imx-uboot-spl-bootpart.wks.in
@@ -13,7 +13,7 @@
 # 0 1kiB  69kiB   4MiB          16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #
 part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1
-part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 69
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}.tagged" --ondisk mmcblk --no-table --align 69
 part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/wic/imx-uboot-spl.wks.in b/wic/imx-uboot-spl.wks.in
index db2f89ddb..c6c9aaa2c 100644
--- a/wic/imx-uboot-spl.wks.in
+++ b/wic/imx-uboot-spl.wks.in
@@ -13,7 +13,7 @@
 # 0 1kiB  69kiB   4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #
 part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1
-part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 69
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}.tagged" --ondisk mmcblk --no-table --align 69
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
 bootloader --ptable msdos
diff --git a/wic/imx-uboot.wks b/wic/imx-uboot.wks
index 60870c34e..cde24798d 100644
--- a/wic/imx-uboot.wks
+++ b/wic/imx-uboot.wks
@@ -12,7 +12,7 @@
 # | |         |              |
 # 0 1kiB    4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #
-part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}.tagged" --ondisk mmcblk --no-table --align 1
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
 bootloader --ptable msdos