47 files changed, 426 insertions, 113 deletions

diff --git a/recipes-bsp/atf/qoriq-atf-2.6.inc b/recipes-bsp/atf/qoriq-atf-2.12.inc
index d5ef5e75e..a025401e0 100644
--- a/recipes-bsp/atf/qoriq-atf-2.6.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.12.inc
@@ -3,10 +3,7 @@ DESCRIPTION = "ARM Trusted Firmware"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
-ATF_BRANCH ?= "lf_v2.6"
+ATF_BRANCH ?= "lf_v2.12"
 ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https"
 SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}"
-SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75"
-
-S = "${WORKDIR}/git"
-
+SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
diff --git a/recipes-bsp/atf/qoriq-atf-tools_2.6.bb b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
index 2c1db306c..2c1db306c 100644
--- a/recipes-bsp/atf/qoriq-atf-tools_2.6.bb
+++ b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
diff --git a/recipes-bsp/atf/qoriq-atf_2.6.bb b/recipes-bsp/atf/qoriq-atf_2.12.bb
index 9f2b0e47a..4eb7be9d3 100644
--- a/recipes-bsp/atf/qoriq-atf_2.6.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.12.bb
@@ -7,9 +7,8 @@ do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy"
 
 PV:append = "+${SRCPV}"
 
-SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=git/mbedtls;name=mbedtls \
-    git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=git/ddr-phy-binary;name=ddr \
-    file://tf-a-tests-no-warn-rwx-segments.patch \
+SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=${S}/mbedtls;name=mbedtls \
+    git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=${S}/ddr-phy-binary;name=ddr \
 "
 SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708"
 SRCREV_ddr = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb
index 0916b45ba..6b53e228f 100644
--- a/recipes-bsp/boot-format/boot-format_git.bb
+++ b/recipes-bsp/boot-format/boot-format_git.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/boot-format;protocol=https;nobra
            file://flags.patch"
 SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550"
 
-S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"'
 
 do_install(){
diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb
index 8ea92502f..5cfeb935e 100644
--- a/recipes-bsp/ddr-phy/ddr-phy_git.bb
+++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb
@@ -7,8 +7,6 @@ inherit deploy
 SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1;protocol=https"
 SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
 
-S = "${WORKDIR}/git"
-
 REGLEX = "lx2160a"
 
 DEPENDS += "qoriq-atf-tools-native"
diff --git a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
index 01e3a2a61..79fff49e6 100644
--- a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
+++ b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
@@ -8,7 +8,7 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-8.16.bin;fsl-eula=true"
 
 SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84"
 
-S = "${WORKDIR}/firmware-imx-8.16"
+S = "${UNPACKDIR}/firmware-imx-8.16"
 
 do_install () {
     install -d ${D}/boot
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb
index d9a6218e7..f776e463d 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb
@@ -3,15 +3,15 @@ SUMMARY = "NXP i.MX ELE firmware"
 DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "19b6ee2"
-SRC_URI[sha256sum] = "14ad172ed70d2f16decca4b55e508dad32923390a298f10a598e8bc7778b6b66"
+IMX_SRCREV_ABBREV = "89161a8"
+SRC_URI[sha256sum] = "2d29f0a4de3662ba15f6a7d9069702d4eaed415d96a17f29d5b127f2c6fdd634"
 
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
 do_compile[noexec] = "1"
 
@@ -24,7 +24,7 @@ do_install() {
 }
 
 do_deploy () {
-    # Deploy the related firmware to be package by imx-boot
+    # Deploy the related firmware to be packaged by imx-boot
     install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
 }
 addtask deploy after do_install before do_build
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc b/recipes-bsp/firmware-imx/firmware-imx-8.28.inc
index 022289d37..db8a78528 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.28.inc
@@ -1,16 +1,16 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
+# Copyright 2017-2025 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 
 # Note: This .inc file is used from differently named recipes, so the package
 # name must be hard-coded, i.e., ${BPN} cannot be used.
 SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "5af0ceb"
-SRC_URI[sha256sum] = "61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f"
+IMX_SRCREV_ABBREV = "994fa14"
+SRC_URI[sha256sum] = "55996f340e87825685a00cd309901189066ec9545ee607734f942c3cde4d69dc"
 
-S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
 
 inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.27.bb b/recipes-bsp/firmware-imx/firmware-imx_8.28.bb
index 7bac8106d..2cd449165 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.28.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2021,2024 NXP
+# Copyright 2017-2021,2024-2025 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SUMMARY = "Freescale i.MX firmware"
 DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index fe520ea84..51e8b69e4 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 NXP
+# Copyright 2020-2025 NXP
 
 SUMMARY = "Wi-Fi firmware redistributed by NXP"
 DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
@@ -7,13 +7,12 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
 
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.12.3_1.0.0"
-SRCREV = "eef7ef94bc44cacd3b068f66658ef33391547daa"
+SRCBRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "d31ea8aaba67e188ba0071a90da0364e3946c83a"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
@@ -69,8 +68,10 @@ PACKAGES =+ " \
     ${PN}-nxp9098-pcie \
     ${PN}-nxp9098-common \
     ${PN}-nxp9098-sdio \
+    ${PN}-nxpaw693-pcie \
     ${PN}-nxpiw416-sdio \
     ${PN}-nxpiw610-sdio \
+    ${PN}-nxpiw610-usb \
     ${PN}-nxpiw612-sdio \
 "
 
@@ -162,6 +163,7 @@ RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 FILES:${PN}-nxpiw610-sdio += " \
     ${nonarch_base_libdir}/firmware/nxp/sd_iw610.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/sduart_iw610.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/sduartspi_iw610.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/uart_iw610_bt.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/uartspi_iw610.bin.se \
 "
@@ -170,6 +172,11 @@ RPROVIDES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RREPLACES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RCONFLICTS:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 
+FILES:${PN}-nxpiw610-usb += " \
+    ${nonarch_base_libdir}/firmware/nxp/usb*_iw610.bin.se \
+"
+RDEPENDS:${PN}-nxpiw610-usb += "${PN}-nxp-common"
+
 FILES:${PN}-nxpiw612-sdio = " \
     ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
@@ -182,6 +189,12 @@ RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 
+FILES:${PN}-nxpaw693-pcie += " \
+    ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
+    ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
+"
+RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
+
 RDEPENDS:${PN}-all-sdio = " \
     ${PN}-nxp8801-sdio \
     ${PN}-nxp8987-sdio \
@@ -194,4 +207,9 @@ RDEPENDS:${PN}-all-sdio = " \
 RDEPENDS:${PN}-all-pcie = " \
     ${PN}-nxp8997-pcie \
     ${PN}-nxp9098-pcie \
+    ${PN}-nxpaw693-pcie \
+"
+
+RDEPENDS:${PN}-all-usb = " \
+    ${PN}-nxpiw610-usb \
 "
diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
index 6e6f90cab..7c5022761 100644
--- a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444"
 SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz"
 SRC_URI[sha256sum] = "eb86c90aec92b3b376e7afca6aa5db4767b5d8868553595907ba37665329f16b"
 
-S = "${WORKDIR}/sof-imx-${PV}"
+S = "${UNPACKDIR}/sof-imx-${PV}"
 
 inherit allarch
 
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.28.bb
index c35e31e07..4c0d51c8a 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.28.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 NXP
+# Copyright (C) 2018-2025 NXP
 SUMMARY = "Freescale i.MX Firmware files used for boot"
 
 require firmware-imx-${PV}.inc
diff --git a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
index 7592a629c..2b5a9f50d 100644
--- a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
+++ b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${UNPACKDIR}/${PN}-${PV}"
 
 inherit fsl-eula-unpack pkgconfig deploy
 
diff --git a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
index 3883c0246..260b01001 100644
--- a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
+++ b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/fsl-tlu;protocol=https;nobranch=1"
 SRCREV = "8837cce3c86b30c0931c319e9e1a8ca622ae5354"
 
-S = "${WORKDIR}/git"
-
 do_install() {
     install -d ${D}${sbindir}/fsl_tlu
     find . -type f -exec cp {} ${D}${sbindir}/fsl_tlu/ \;
diff --git a/recipes-bsp/imx-atf/imx-atf_2.10.bb b/recipes-bsp/imx-atf/imx-atf_2.12.bb
index 13478bbe6..ba494594f 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.10.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.12.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2024 NXP
+# Copyright (C) 2017-2025 NXP
 
 DESCRIPTION = "i.MX ARM Trusted Firmware"
 SECTION = "BSP"
@@ -9,10 +9,8 @@ PV .= "+git${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-imx93-trdc-Fix-header-guard.patch"
-SRCBRANCH = "lf_v2.10"
-SRCREV = "78a14c75a06dea39036c44ae0f9d23acc7bcaef2"
-
-S = "${WORKDIR}/git"
+SRCBRANCH = "lf_v2.12"
+SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
 
 inherit deploy
 
diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb
index bdb02475a..4f0ed79a1 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_git.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \
            file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \
 "
 SRCREV = "ff13a99a22aa73cca0e09a33c2ebb6a94ad698da"
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index cff0313e2..5cf1b5744 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -14,11 +14,9 @@ PV = "5.9+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-Fix-gcc-15-errors.patch"
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
 SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
 
-S = "${WORKDIR}/git"
-
 inherit use-imx-headers
 
 PLATFORM:mx6q-nxp-bsp   = "IMX6Q"
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index ad464aee2..a14d98241 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -5,10 +5,8 @@ DEPENDS = "zlib-native openssl-native"
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.12.3_1.0.0"
-SRCREV = "9e60b1f7a87a6397cf8db10e07293075f489e974"
-
-S = "${WORKDIR}/git"
+SRCBRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "4c2e5b25232f5aa003976ddca9d1d2fb9667beb1"
 
 BOOT_TOOLS = "imx-boot-tools"
 SYSROOT_DIRS += "/boot"
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
index 1354356b6..42e8f6e19 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 SRC_URI[sha256sum] = "392f1e5cdf1c8d7ed75409a2c46b00a332ace677f0e2700b587fe9ae800a1ff3"
 IMX_SRCREV_ABBREV = "654907b"
 
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index 353dcb910..fe366aacb 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -16,8 +16,6 @@ SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRA
            file://0001-Fix-return-value-of-void-functions.patch"
 SRCREV = "273553f207425f773400be7a7f3a7c425d892d6f"
 
-S = "${WORKDIR}/git"
-
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install () {
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
index 352fc49ee..2710297d6 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
@@ -13,7 +13,7 @@ SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 SRC_URI[sha256sum] = "bd8dc01966076836aabff53f2463295294166595006e1db430db21b6ffa6b667"
 IMX_SRCREV_ABBREV = "0333596"
 
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 
 do_compile[noexec] = "1"
 
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
index cebfbdf91..525824f79 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -14,8 +14,6 @@ SRCREV = "dffbb844e86f4a49058ffbb40548474059969c27"
 
 PV = "lf-6.6.52_2.2.0"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE += "PLAT=ele"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 0a0934694..3dd6153a0 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -14,16 +14,15 @@ DEPENDS:append:mx6-nxp-bsp    = " imx-lib"
 DEPENDS:append:mx7-nxp-bsp    = " imx-lib"
 DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
 DEPENDS:append:mx93-nxp-bsp   = " imx-lib"
+DEPENDS:append:mx943-nxp-bsp  = " imx-lib"
 
 PE = "1"
 PV = "7.0+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
            file://memtool_profile"
-SRCBRANCH = "lf-6.12.3_1.0.0"
-SRCREV = "92a497313016bfa536d561e13fcbad2d273ded4c"
-
-S = "${WORKDIR}/git"
+SRCBRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "38f9cf1f08bb6fcdd6aaf9191e0b53f02e02537b"
 
 inherit module-base use-imx-headers
 
@@ -42,6 +41,7 @@ PLATFORM:mx8-nxp-bsp = "IMX8"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
 PLATFORM:mx91-nxp-bsp = "IMX8"
 PLATFORM:mx93-nxp-bsp = "IMX8ULP"
+PLATFORM:mx943-nxp-bsp = "IMX8ULP"
 PLATFORM:mx95-nxp-bsp = "IMX8"
 
 PARALLEL_MAKE = "-j 1"
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index 754e68eb0..54997ae37 100644
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright (C) 2017-2019,2024 NXP
+# Copyright (C) 2017-2019,2024-2025 NXP
 SUMMARY = "A Daemon wait for NXP mfgtools host's command"
 SECTION = "base"
 DEPENDS = "virtual/kernel dosfstools-native"
@@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r1"
 PV = "0.5.1+git${SRCPV}"
 
-SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/nxp-imx/imx-uuc.git;protocol=https;branch=master"
 SRCREV = "25f65e10368aa07056f9536e88ed911ac7f38f99"
 
-S = "${WORKDIR}/git"
-
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
 }
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
index 5aaf92c5f..68c2a4979 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
@@ -14,7 +14,7 @@ IMX_SRCREV_ABBREV = "c0244a1"
 
 SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
 
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
 # SCR is the location and name of the Software Content Register file
 # relative to ${D}${D_SUBDIR}.
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
index ac42b6870..940b9fa41 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
@@ -11,7 +11,7 @@ IMX_SRCREV_ABBREV = "3200e68"
 
 SRC_URI[sha256sum] = "e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535"
 
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
 PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
 PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
index 3a171942f..d766e0191 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
@@ -15,7 +15,7 @@ IMX_SRCREV_ABBREV = "194a305"
 
 SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7"
 
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
 inherit fsl-eula-unpack use-imx-headers
 
diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb
index 4deacb581..5c2e4197f 100644
--- a/recipes-bsp/inphi/inphi_git.bb
+++ b/recipes-bsp/inphi/inphi_git.bb
@@ -7,8 +7,6 @@ inherit deploy
 SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;nobranch=1;protocol=https"
 SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     install -d ${D}/boot
     cp -fr ${S}/in112525-phy-ucode.txt ${D}/boot
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
index 550250b2d..012e1f2b7 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
@@ -2,17 +2,17 @@
 
 DESCRIPTION = "Basler camera binary drivers"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 
-IMX_SRCREV_ABBREV = "d1f506a"
+IMX_SRCREV_ABBREV = "dd86758"
 
 inherit fsl-eula-unpack
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 
-SRC_URI[sha256sum] = "49d1b3691d18e2ba5f43a6e2c59ac16767b6e077a118cafec7f51293d6bf30f3"
+SRC_URI[sha256sum] = "aa86adeb0c53c3306f7e1c004ffa78ebb7db3e9136c78759e4029b4b5e1b1a64"
 
-S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 
 do_compile[noexec] = "1"
 
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
new file mode 100644
index 000000000..617abde6f
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
@@ -0,0 +1,32 @@
+From d24c74528fefd1316f1633f0a7f1a5acea40454f Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Thu, 19 Jan 2023 15:51:24 +0000
+Subject: [PATCH 1/5] isp-imx: start_isp: don't report error if no camera is
+ configured
+
+The script currently returns '6' when no known camera is configured
+in the device tree. The end result is that the systemd imx8-isp.service
+goes to the failed state.
+Return '0' in that case as obviously the device tree doesn't have a
+camera configured and the service is not needed.
+
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ imx/start_isp.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imx/start_isp.sh b/imx/start_isp.sh
+index d544b4ca2a57..22e7783437d6 100755
+--- a/imx/start_isp.sh
++++ b/imx/start_isp.sh
+@@ -72,5 +72,5 @@ elif [ $NR_DEVICE_TREE_OS08A20 -eq 2 ]; then
+ else
+        # no device tree found exit with code no device or address
+        echo "No device tree found for Basler camera or os08a20, check dtb file!" >&2
+-       exit 6
++       exit 0
+ fi
+-- 
+2.42.0
+
diff --git a/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch b/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch
new file mode 100644
index 000000000..38b3b6b02
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch
@@ -0,0 +1,134 @@
+From 5b69b60bd4d0d5ed1474c6457561d48cdbabc778 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Fri, 25 Jul 2025 09:19:58 +0000
+Subject: [PATCH 2/5] appshell: cmake: bump min version to 3.5
+
+CMake 4 no longer supports min version set to before 3.5
+
+|  CMake Error at CMakeLists.txt:28 (cmake_minimum_required):
+|    Compatibility with CMake < 3.5 has been removed from CMake.
+
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ appshell/CMakeLists.txt                        | 2 +-
+ appshell/display/CMakeLists.txt                | 2 +-
+ appshell/display/wayland-client/CMakeLists.txt | 2 +-
+ appshell/v4l_drm_test/CMakeLists.txt           | 2 +-
+ appshell/vvext/CMakeLists.txt                  | 2 +-
+ appshell/yuv/CMakeLists.txt                    | 2 +-
+ units/CMakeLists.txt                           | 2 +-
+ units/isi/CMakeLists.txt                       | 2 +-
+ units/isi/drv/OS08a20/CMakeLists.txt           | 2 +-
+ units/isi/drv/OS08a20/calib/CMakeLists.txt     | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/appshell/CMakeLists.txt b/appshell/CMakeLists.txt
+index 22092ce975b5..cf14e254c812 100644
+--- a/appshell/CMakeLists.txt
++++ b/appshell/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ # *****************************************************************************/
+ 
+ 
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.5.0)
+ project(ISP_APP_SHELL)
+ 
+ if(DEFINED QTLESS)
+diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
+index 491f086adf55..458a46b165b4 100755
+--- a/appshell/display/CMakeLists.txt
++++ b/appshell/display/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.6)
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
+ 
+diff --git a/appshell/display/wayland-client/CMakeLists.txt b/appshell/display/wayland-client/CMakeLists.txt
+index 78247528b0e4..0639d79d8346 100644
+--- a/appshell/display/wayland-client/CMakeLists.txt
++++ b/appshell/display/wayland-client/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.6)
+ 
+ set(WAYLAND_XML_PRIFIX ${SDKTARGETSYSROOT}/usr/share/wayland-protocols)
+ set(GEN_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/display/wayland-client)
+diff --git a/appshell/v4l_drm_test/CMakeLists.txt b/appshell/v4l_drm_test/CMakeLists.txt
+index cf4685c84204..309e5d465e99 100755
+--- a/appshell/v4l_drm_test/CMakeLists.txt
++++ b/appshell/v4l_drm_test/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+ 
+ project(ISP_V4L_DRM_TEST)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+diff --git a/appshell/vvext/CMakeLists.txt b/appshell/vvext/CMakeLists.txt
+index a5d6c12929fa..63c1eb5f7073 100755
+--- a/appshell/vvext/CMakeLists.txt
++++ b/appshell/vvext/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+ 
+ project(ISP_V4L_DRM_TEST)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+diff --git a/appshell/yuv/CMakeLists.txt b/appshell/yuv/CMakeLists.txt
+index 131766fcb5d4..0f3591918e08 100755
+--- a/appshell/yuv/CMakeLists.txt
++++ b/appshell/yuv/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+ set (CMAKE_CXX_FLAGS_DEBUG "")
+ set (CMAKE_C_FLAGS_DEBUG "")
+ 
+diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt
+index 37fa65ed4ea8..10abbef1c16c 100755
+--- a/units/CMakeLists.txt
++++ b/units/CMakeLists.txt
+@@ -24,7 +24,7 @@
+ # *
+ # *****************************************************************************/
+ 
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.5.0)
+ project(ISPcore_SW_STACK)
+ if( NOT DEFINED APPSHELL_TOP_COMPILE)
+ 
+diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
+index a91699b4a1a5..ea01aa7d9424 100755
+--- a/units/isi/CMakeLists.txt
++++ b/units/isi/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # define module name
+ set (module isi)
+diff --git a/units/isi/drv/OS08a20/CMakeLists.txt b/units/isi/drv/OS08a20/CMakeLists.txt
+index d27dc97f7945..12c6e9ef993a 100755
+--- a/units/isi/drv/OS08a20/CMakeLists.txt
++++ b/units/isi/drv/OS08a20/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # define module name & interface version
+ set (module os08a20)
+diff --git a/units/isi/drv/OS08a20/calib/CMakeLists.txt b/units/isi/drv/OS08a20/calib/CMakeLists.txt
+index b44b08248135..18119086b967 100755
+--- a/units/isi/drv/OS08a20/calib/CMakeLists.txt
++++ b/units/isi/drv/OS08a20/calib/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # use upper level module name
+ 
+-- 
+2.42.0
+
diff --git a/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch b/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch
new file mode 100644
index 000000000..f11deb758
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch
@@ -0,0 +1,37 @@
+From db07010535d47d7d7eaf3865d97dcec045e19930 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Fri, 25 Jul 2025 09:57:22 +0000
+Subject: [PATCH 3/5] appshell: cmake: drop deprecated use of
+ target_link_libraries
+
+Works around:
+
+| CMake Error at display/CMakeLists.txt:48 (target_link_libraries):
+|   Cannot specify link libraries for target "wayland-client" which is not
+|   built by this project.
+
+caused by CMake 4 deprecating https://cmake.org/cmake/help/v3.5/policy/CMP0016.html
+
+CMP0016 states that the command is silently ignored, thus drop it.
+
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ appshell/display/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
+index 458a46b165b4..160755312368 100755
+--- a/appshell/display/CMakeLists.txt
++++ b/appshell/display/CMakeLists.txt
+@@ -43,7 +43,6 @@ if (WAYLAND_SUPPORT)
+     file(GLOB pub_headers *.h)
+     file(GLOB libsources *.cpp ./wayland-client/*.c)
+     include_directories(./wayland-client)
+-    target_link_libraries(wayland-client)
+ else (WAYLAND_SUPPORT)
+     file(GLOB pub_headers *.h)
+     file(GLOB libsources *.cpp)
+-- 
+2.42.0
+
diff --git a/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch b/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch
new file mode 100644
index 000000000..087f24090
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch
@@ -0,0 +1,51 @@
+From d7e06f57c067e50d86369577b8dc3bccdde6fd40 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Fri, 25 Jul 2025 10:44:40 +0000
+Subject: [PATCH 4/5] units/targets.cmake: fix check if a target exists
+
+| CMake Error at units/targets.cmake:35 (get_target_property):
+|   get_target_property() called with non-existent target "lib".
+
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ units/targets.cmake | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/units/targets.cmake b/units/targets.cmake
+index 663a024d9129..d78dbf8b8a45 100755
+--- a/units/targets.cmake
++++ b/units/targets.cmake
+@@ -32,8 +32,7 @@ add_dependencies(create_alldir ${module}_create_dir)
+ # Settings for target LIB
+ ###############################################################################
+ # check if lib target already exists and create it, this is to assure that only one target called lib will be generated
+-get_target_property(LIB_TARGET lib TYPE)
+-if(NOT LIB_TARGET)
++if(NOT TARGET lib)
+     add_custom_target(lib)
+ endif()
+ # the library itself is a dependency for the target lib
+@@ -83,8 +82,7 @@ if(HAVE_PUBLIC_HEADERS)
+ endif()
+ 
+ # check if lib_install target already exists and create it
+-get_target_property(LIB_INSTALL_TARGET lib_install TYPE)
+-if(NOT LIB_INSTALL_TARGET)
++if(NOT TARGET lib_install)
+     add_custom_target(lib_install)
+ endif()
+ 
+@@ -104,8 +102,7 @@ add_custom_target(${module}_copy_header
+                     COMMENT "Copying Headers of ${module}")
+ 
+ # check if copy_header target already exists and create it
+-get_target_property(COPY_HEADER_TARGET copy_header TYPE)
+-if(NOT COPY_HEADER_TARGET)
++if(NOT TARGET copy_header)
+     add_custom_target(copy_header)
+ endif()
+ # if copy_header is selected, modulename_copy_header target must be created
+-- 
+2.42.0
+
diff --git a/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch b/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch
new file mode 100644
index 000000000..f4b44ff47
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch
@@ -0,0 +1,36 @@
+From 72d6160d1efc9df8bdee4e3dc9da67560f2206b4 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Fri, 25 Jul 2025 10:52:52 +0000
+Subject: [PATCH 5/5] units: cmake: fix use of add_dependencies
+
+With CMake 4 we get during configure:
+
+| CMake Error at isp-imx/4.2.2.25.2/sources/isp-imx-4.2.2.25.2-3cac1fb:
+|   The dependency target "drv/OS08a20" of target "copy_shell_libs_isi" does
+|   not exist.
+
+Comment out that the add_dependencies. The driver for OS08a20 is still
+part of the built packages.
+
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ units/isi/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
+index ea01aa7d9424..2f5c3d803e67 100755
+--- a/units/isi/CMakeLists.txt
++++ b/units/isi/CMakeLists.txt
+@@ -93,7 +93,7 @@ add_custom_target(copy_shell_libs_${module} ALL
+        COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*/*.cfg  ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
+        COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*.cfg  ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
+ )
+-add_dependencies(copy_shell_libs_${module} drv/OS08a20)
++#add_dependencies(copy_shell_libs_${module} os08a20_shared)
+ 
+ endif (GENERATE_PARTITION_BUILD)
+ 
+-- 
+2.42.0
+
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb
index 25ffdd8a1..445822528 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb
@@ -2,18 +2,25 @@
 
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
 
 SRC_URI = " \
     ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ISP_SYSTEMD_PATCH}', '', d)} \
+    file://0002-appshell-cmake-bump-min-version-to-3.5.patch \
+    file://0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch \
+    file://0004-units-targets.cmake-fix-check-if-a-target-exists.patch \
+    file://0005-units-cmake-fix-use-of-add_dependencies.patch \
 "
-IMX_SRCREV_ABBREV = "327f21d"
-S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+ISP_SYSTEMD_PATCH = "file://0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch"
 
-SRC_URI[sha256sum] = "f57c6fe1c2dd1c8e5991a625d0b3a1dbfdfe6d39a1a116a904d543faa0f4f6f0"
+IMX_SRCREV_ABBREV = "3cac1fb"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
-inherit fsl-eula-unpack cmake systemd use-imx-headers
+SRC_URI[sha256sum] = "8fa5094da6438505287f4dcc8033dad3057ab81bf98c858884f7c3a2e521b252"
+
+inherit fsl-eula-unpack cmake pkgconfig systemd use-imx-headers
 
 PACKAGECONFIG = ""
 # Note: building with tuningext fails with boost 1.87.
@@ -36,7 +43,6 @@ EXTRA_OECMAKE += " \
     -DCMAKE_BUILD_TYPE=release \
     -DISP_VERSION=ISP8000NANO_V1802 \
     -DPLATFORM=ARM64 \
-    -DTUNINGEXT=1 \
     -DQTLESS=1 \
     -DFULL_SRC_COMPILE=1 \
     -DWITH_DRM=1 \
@@ -48,7 +54,7 @@ EXTRA_OECMAKE += " \
     -Wno-dev \
 "
 
-do_configure:prepend () {
+do_configure_disable:prepend () {
     # FIXME: should be rebuild.
     patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/bin/isp_media_server
     patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/lib/libmedia_server.so
@@ -59,9 +65,6 @@ do_configure:prepend () {
 }
 
 do_install() {
-    # FIXME: provided by the basler-camera package, do not install them here additionally
-    rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json
-
     # The Makefile unconditionally installs tuningext even if it is not built
     if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
         touch ${B}/generated/release/bin/tuningext
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
index 5b04b1e2c..b1cd3d863 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
@@ -13,9 +13,6 @@ SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};pr
            file://run-ptest \
           "
 
-
-S = "${WORKDIR}/git"
-
 inherit pkgconfig waf use-imx-headers ptest
 
 EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \
diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb
index c13a05a19..60ab5e183 100644
--- a/recipes-bsp/ls2-phy/ls2-phy_git.bb
+++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb
@@ -7,8 +7,6 @@ inherit deploy
 SRC_URI = "git://github.com/nxp/qoriq-firmware-cortina.git;nobranch=1;protocol=https"
 SRCREV = "9143c2a3adede595966583c00ca4edc99ec698cf"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     install -d ${D}/boot
     cp -fr ${S}/* ${D}/boot
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index 696307209..2d09bbcc8 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -8,9 +8,7 @@ DEPENDS += "dtc-native"
 inherit deploy
 
 SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1"
-SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc"
-
-S = "${WORKDIR}/git"
+SRCREV = "f5c4b2c9d2b1d5122a7d97f236894f87959b3831"
 
 MC_CFG ?= ""
 MC_CFG:ls1088a = "ls1088a"
diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb
index 17da814f8..9fc6338c4 100644
--- a/recipes-bsp/mxsldr/mxsldr_git.bb
+++ b/recipes-bsp/mxsldr/mxsldr_git.bb
@@ -13,8 +13,6 @@ SRC_URI = "git://git.denx.de/mxsldr.git;branch=master \
 
 PV = "0.0.0+git${SRCPV}"
 
-S = "${WORKDIR}/git"
-
 inherit pkgconfig
 
 do_compile() {
diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
index bb542e8c0..ddbb2031c 100644
--- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
+++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
@@ -10,8 +10,6 @@ inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1;protocol=https"
 SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     install -d ${D}${nonarch_base_libdir}/firmware
     install -d ${D}/boot/engine-pfe-bin
diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
index 9b76d24a6..582fb1e46 100644
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -8,8 +8,6 @@ inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1;protocol=https"
 SRCREV = "c89d7843943fd3bd52aa5f1ff7a91200a2f7f63b"
 
-S = "${WORKDIR}/git"
-
 do_install () {
        install -d ${D}/boot
        install -m 644 ${B}/*.bin ${D}/boot
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index be166f441..6a52861b0 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,9 +8,7 @@ DEPENDS += "tcl-native"
 inherit deploy siteinfo
 
 SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1"
-SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4"
-
-S = "${WORKDIR}/git"
+SRCREV = "45e69253690452656a4dfe933c4c9f55e1eb0f5f"
 
 export PYTHON = "${USRBINPATH}/python3"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
index 134028503..9cc6b958d 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
@@ -16,5 +16,4 @@ SRCBRANCH = "2025.01+fslc"
 PV = "2025.01+fslc+git${SRCPV}"
 CVE_PRODUCT = "denx:u-boot"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
index 01e3bbca3..9640ba1de 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
@@ -18,7 +18,6 @@ DEPENDS += " \
     xxd-native \
 "
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 inherit fsl-u-boot-localversion
diff --git a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
index 695987801..27c3555f4 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
@@ -23,11 +23,13 @@ do_deploy:append:mx8m-generic-bsp() {
         for config in ${UBOOT_MACHINE}; do
             i=$(expr $i + 1);
             for type in ${UBOOT_CONFIG}; do
+                builddir="${config}-${type}"
                 j=$(expr $j + 1);
                 if [ $j -eq $i ]
                 then
+                    builddir="${config}-${type}"
                     install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-                    install -m 0644 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type}
+                    install -m 0644 ${B}/${builddir}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type}
                     UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}"
                     for key_value in ${UBOOT_DTB_NAME_FLAGS}; do
                         local type_key="${key_value%%:*}"
@@ -37,11 +39,11 @@ do_deploy:append:mx8m-generic-bsp() {
                             bbnote "UBOOT_CONFIG = $type, UBOOT_DTB_NAME = $dtb_name"
                             # There is only one ${dtb_name}, the first one. All the other are with the type appended
                             if [ ! -f "${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}" ]; then
-                                install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
+                                install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
                             else
                                 bbwarn "Use custom wks.in for $dtb_name = $type"
                             fi
-                            install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
+                            install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
                         fi
                         unset type_key
                         unset dtb_name
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
index bd495af94..be8433e47 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -10,20 +10,23 @@ LIC_FILES_CHKSUM = " \
     file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
     file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.0.txt;md5=4cf66a4984120007c9881cc871cf49db \
     file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
 
-SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1"
-SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
+PV:append = "+${SRCPV}"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
+UBOOT_BRANCH ?= "lf_v2025.04"
+UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https"
+SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}"
+SRCREV = "9383f8387dc76524524da69992db96c22195a57c"
+
+B = "${UNPACKDIR}/build"
 PV:append = "+fslgit"
 LOCALVERSION = "+fsl"
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native python3-setuptools-native"
+DEPENDS = "libgcc virtual/cross-cc bison-native bc-native gnutls-native swig-native python3-native"
 DEPENDS:append:qoriq-arm64 = " dtc-native"
 DEPENDS:append:qoriq-arm = " dtc-native"
 DEPENDS:append:qoriq-ppc = " boot-format-native"
@@ -40,7 +43,7 @@ python () {
             raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR')
+        workdir = d.getVar('UNPACKDIR')
         d.setVar('DEPENDS:append', ' lib32-gcc-cross-powerpc lib32-libgcc')
         d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
@@ -50,7 +53,7 @@ python () {
             raise bb.parse.SkipRecipe("Building the u-boot for this arch requires multilib to be enabled")
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR')
+        workdir = d.getVar('UNPACKDIR')
         d.setVar('DEPENDS:append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
         d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
@@ -80,8 +83,6 @@ do_compile:append:qoriq() {
                         boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
                             ${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
                         cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
-                    elif [ "qspi" = "${type}" ];then
-                        cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
                     fi
                 fi
             done
@@ -92,6 +93,48 @@ do_compile:append:qoriq() {
     unset i
 }
 
+do_deploy:append:lx2162a () {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    if [ "tfa-verified-boot" = "${type}" ];then
+                        builddir="${config}-${type}"
+                        install -m 644 ${B}/${builddir}/u-boot.dtb ${DEPLOYDIR}/u-boot.dtb
+                    fi
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
+
+do_deploy:append:ls102xa () {
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    if expr "$type" : sdcard;then
+                        builddir="${config}-${type}"
+                        install -m 644 ${B}/${builddir}/u-boot-dtb.bin ${DEPLOYDIR}/u-boot-dtb.${UBOOT_SUFFIX}-${type}
+                        install -m 644 ${B}/${builddir}/spl/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl.${UBOOT_SUFFIX}-${type}
+                    fi
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+}
 
 PACKAGES += "${PN}-images"
 FILES:${PN}-images += "/boot"
diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index 268b5b1d9..c0222a817 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -8,8 +8,6 @@ inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https"
 SRCREV = "55789d536850e00c6f2284fb28eaf21712cd276b"
 
-S = "${WORKDIR}/git"
-
 do_install () {
        if [ -d ${B}/${MACHINE} ]; then
            install -d ${D}/uefi