20 files changed, 106 insertions, 594 deletions
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index d0607a093..98fb5c5e5 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -10,8 +10,8 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bc649096ad3928ec06a8713b8d787eac"
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.12.49_2.2.0"
+SRCBRANCH = "lf-6.18.2_1.0.0"
-SRCREV = "8c9b278016c97527b285f2fcbe53c2d428eb171d"
+SRCREV = "d7e4bb37b45bbf93faf888e0ca6763a29e28054a"
 inherit allarch
@@ -28,15 +28,13 @@ do_install() {
    install -d ${D}${nonarch_base_libdir}/firmware/nxp
    oe_runmake install INSTALLDIR=${D}${nonarch_base_libdir}/firmware/nxp
-    # Upstream SDIO8997 and IW416 driver firmwares are located on mrvl folder
+    # Upstream ISDIO8997 and W416 driver firmwares are located on mrvl folder
    install -d ${D}${nonarch_base_libdir}/firmware/mrvl
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd9098_wlan_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio9098_wlan_v1.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart9098_combo_v1.bin
-    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd8997_wlan_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio8997_wlan_v4.bin
-    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduartiw416_combo.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin
 }
@@ -47,8 +45,6 @@ PACKAGES =+ " \
    \
    ${PN}-nxp-common \
    ${PN}-nxp8987-sdio \
-    ${PN}-nxp8997-common \
-    ${PN}-nxp8997-pcie \
    ${PN}-nxp8997-sdio \
    ${PN}-nxp9098-common \
    ${PN}-nxp9098-pcie \
@@ -70,7 +66,6 @@ RDEPENDS:${PN}-all-sdio = " \
 "
 RDEPENDS:${PN}-all-pcie = " \
-    ${PN}-nxp8997-pcie \
    ${PN}-nxp9098-pcie \
    ${PN}-nxpaw693-pcie \
 "
@@ -92,32 +87,9 @@ RPROVIDES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RREPLACES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
-FILES:${PN}-nxp8997-common = " \
-    ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \
-    ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \
-    ${nonarch_base_libdir}/firmware/nxp/uart8997_bt_v4.bin \
-"
-RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common"
-RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
-RREPLACES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
-RCONFLICTS:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
-FILES:${PN}-nxp8997-pcie = " \
-    ${nonarch_base_libdir}/firmware/nxp/pci*8997* \
-"
-RDEPENDS:${PN}-nxp8997-pcie += "${PN}-nxp8997-common"
-RPROVIDES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
-RREPLACES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
-RCONFLICTS:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
 FILES:${PN}-nxp8997-sdio = " \
    ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
-    ${nonarch_base_libdir}/firmware/nxp/sd*8997* \
 "
-RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common"
-RPROVIDES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
-RREPLACES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
-RCONFLICTS:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
 FILES:${PN}-nxp9098-common = " \
    ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
@@ -178,11 +150,11 @@ FILES:${PN}-nxpiw610-usb += " \
 RDEPENDS:${PN}-nxpiw610-usb += "${PN}-nxp-common"
 FILES:${PN}-nxpiw612-sdio = " \
-    ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
-    ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_*.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_*.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_*.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \
-    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_v1.bin.se \
 "
 RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
diff --git a/recipes-bsp/imx-atf/imx-atf_2.12.bb b/recipes-bsp/imx-atf/imx-atf_2.12.bb
index ba494594f..ad2f6bd46 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.12.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.12.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2025 NXP
+# Copyright (C) 2017-2026 NXP
 DESCRIPTION = "i.MX ARM Trusted Firmware"
 SECTION = "BSP"
@@ -7,13 +7,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
 PV .= "+git${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "${ATF_SRC};branch=${SRCBRANCH}"
-           file://0001-imx93-trdc-Fix-header-guard.patch"
+ATF_SRC ?= "git://github.com/nxp-imx/imx-atf.git;protocol=https"
 SRCBRANCH = "lf_v2.12"
-SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
+SRCREV = "4a2e9ef5f9f185bda68470b46365add008903b8c"
 inherit deploy
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} \
+    ${@bb.utils.filter('MACHINE_FEATURES', 'optee', d)}"
+PACKAGECONFIG[crrm] = "IMX_CRRM=1"
+PACKAGECONFIG[debug] = "DEBUG=1,DEBUG=0"
+PACKAGECONFIG[optee] = "SPD=opteed"
 ATF_PLATFORM ??= "INVALID"
 # FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART
@@ -23,8 +31,9 @@ ATF_BOOT_UART_BASE ?= ""
 EXTRA_OEMAKE += " \
    CROSS_COMPILE=${TARGET_PREFIX} \
    PLAT=${ATF_PLATFORM} \
+    ${PACKAGECONFIG_CONFARGS} \
+    bl31 \
 "
 # Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application
 CFLAGS[unexport] = "1"
 LDFLAGS[unexport] = "1"
@@ -38,8 +47,6 @@ DEPENDS = "virtual/cross-cc"
 # Bring in clang compiler if using clang as default
 DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}"
-BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
 # CC and LD introduce arguments which conflict with those otherwise provided by
 # this recipe. The heads of these variables excluding those arguments
 # are therefore used instead.
@@ -58,23 +65,19 @@ EXTRA_OEMAKE += 'IMX_BOOT_UART_BASE=${ATF_BOOT_UART_BASE}'
 do_configure[noexec] = "1"
-do_compile() {
-    # Clear LDFLAGS to avoid the option -Wl recognize issue
-    oe_runmake bl31
-    if ${BUILD_OPTEE}; then
-        oe_runmake clean BUILD_BASE=build-optee
-        oe_runmake BUILD_BASE=build-optee SPD=opteed bl31
-    fi
-}
 do_install[noexec] = "1"
+ANNOTATED_NAME        = "bl31-${ATF_PLATFORM}.bin"
+ANNOTATED_NAME:append = "${@bb.utils.contains('PACKAGECONFIG',  'crrm',  '-crrm', '', d)}"
+ANNOTATED_NAME:append = "${@bb.utils.contains('PACKAGECONFIG', 'optee', '-optee', '', d)}"
 addtask deploy after do_compile
 do_deploy() {
-    install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin
+    OUTPUT_FOLDER="${@bb.utils.contains('PACKAGECONFIG', 'debug', 'debug', 'release', d)}"
-    if ${BUILD_OPTEE}; then
+    for deploydir in ${DEPLOYDIR} ${DEPLOYDIR}/imx-boot-tools; do
-        install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin-optee
+        install -Dm 0644 ${S}/build/${ATF_PLATFORM}/${OUTPUT_FOLDER}/bl31.bin $deploydir/${ANNOTATED_NAME}
-    fi
+    done
+    ln -sf ${ANNOTATED_NAME} ${DEPLOYDIR}/bl31.bin
 }
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
index 2710297d6..a9d021b6c 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
@@ -17,7 +17,10 @@ S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 do_compile[noexec] = "1"
-do_install[noexec] = "1"
+do_install:append() {
+    install -d ${D}${base_libdir}/firmware/${PN}
+    install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${D}${base_libdir}/firmware/${PN}
+}
 addtask deploy after do_install
 do_deploy () {
@@ -25,4 +28,5 @@ do_deploy () {
    install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
 }
+FILES:${PN} = "/"
 COMPATIBLE_MACHINE = "(mx8qm-generic-bsp|mx8qxp-generic-bsp|mx8dxl-generic-bsp|mx8dx-generic-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
deleted file mode 100644
index 8d017ab71..000000000
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e7f6097c9e7cb30f130502cc4804e1a1b01342de Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 16:13:38 +0000
-Subject: [PATCH] base_type.h: make header compatible with c23
-With C23 bool, true and false are built in keywords and cannot be
-redefined.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- usr/include/hantro_VC8000E_enc/base_type.h | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/usr/include/hantro_VC8000E_enc/base_type.h b/usr/include/hantro_VC8000E_enc/base_type.h
-index 282fc81b8eba..af4212eed2bd 100755
--- a/usr/include/hantro_VC8000E_enc/base_type.h
-+++ b/usr/include/hantro_VC8000E_enc/base_type.h
-@@ -67,6 +67,9 @@ typedef       unsigned int        UInt;
- #define HANTRO_FALSE 0
- #define HANTRO_TRUE  1
- 
-+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
-+/* bool, true and false are keywords.  */
-+#else
- #ifndef bool
- typedef enum
- {
-@@ -74,6 +77,7 @@ typedef enum
-   true  = HANTRO_TRUE
- } bool;
- #endif
-+#endif
- 
- enum
- {
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
index 68c2a4979..528b05e17 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
@@ -2,18 +2,14 @@
 DESCRIPTION = "i.MX VC8000E Encoder library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 inherit fsl-eula-unpack
-SRC_URI = " \
+SRC_URI = " ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+IMX_SRCREV_ABBREV = "5e18a84"
-    file://0001-base_type.h-make-header-compatible-with-c23.patch \
-"
-IMX_SRCREV_ABBREV = "c0244a1"
-SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
+SRC_URI[sha256sum] = "04d2a9c5c75804a11a4500a0133dfc7d8e84f74254cee52c42075f5ecc229550"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 # SCR is the location and name of the Software Content Register file
@@ -36,4 +32,5 @@ do_install () {
 FILES:${PN} = "/"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
index 940b9fa41..d24ab66ea 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
@@ -7,9 +7,9 @@ DEPENDS = "imx-vpu-hantro"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.tar.gz"
-IMX_SRCREV_ABBREV = "3200e68"
+IMX_SRCREV_ABBREV = "a4cefcc"
-SRC_URI[sha256sum] = "e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535"
+SRC_URI[sha256sum] = "629087dd3e9ae0f4c00a75a2f2b715b7e24918b7401b26137e9270d6ac0fa90c"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
deleted file mode 100644
index bbfec172a..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e39a6602817e4221ae09ac3d520ca6a0d94814dc Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 16:13:38 +0000
-Subject: [PATCH] basetype.h: make header compatible with c23
-With C23 bool, true and false are built in keywords and cannot be
-redefined.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- h1_encoder/software/inc/basetype.h | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/h1_encoder/software/inc/basetype.h b/h1_encoder/software/inc/basetype.h
-index 55e46a195b3b..6655ec54481b 100755
--- a/h1_encoder/software/inc/basetype.h
-+++ b/h1_encoder/software/inc/basetype.h
-@@ -66,12 +66,16 @@ typedef size_t ptr_t;
- #define PRT_PTR "x"
- #endif
- 
-+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
-+/* bool, true and false are keywords.  */
-+#else
- #ifndef __cplusplus
- typedef enum {
-         false   = 0,
-         true    = 1
- } bool;
- #endif
-+#endif
- 
- #else /* __symbian__ or __win__ or whatever, customize it to suit well */
- 
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
deleted file mode 100644
index da1af2b9c..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 0c5bdd12a6f3ba73e605656828bf429966a997ef Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 13:25:26 +0000
-Subject: [PATCH] test: md5: convert to ansi c
-GCC 15 no longer likes this K&R style function declarations.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- decoder_sw/software/test/common/swhw/md5.c | 15 +++++----------
- decoder_sw/software/test/common/swhw/md5.h |  8 ++++----
- 2 files changed, 9 insertions(+), 14 deletions(-)
-diff --git a/decoder_sw/software/test/common/swhw/md5.c b/decoder_sw/software/test/common/swhw/md5.c
-index c3334bf751fd..20014fbdf268 100755
--- a/decoder_sw/software/test/common/swhw/md5.c
-+++ b/decoder_sw/software/test/common/swhw/md5.c
-@@ -42,8 +42,7 @@
- /*
-  * Note: this code is harmless on little-endian machines.
-  */
-void ByteReverse(buf, longs) unsigned char *buf;
-unsigned longs;
-+void ByteReverse(unsigned char *buf, unsigned longs)
- {
-   uint32 t;
-   do {
-@@ -59,7 +58,7 @@ unsigned longs;
-  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-  * initialization constants.
-  */
-void MD5Init(ctx) struct MD5Context *ctx;
-+void MD5Init(struct MD5Context *ctx)
- {
-   ctx->buf[0] = 0x67452301;
-   ctx->buf[1] = 0xefcdab89;
-@@ -74,9 +73,7 @@ void MD5Init(ctx) struct MD5Context *ctx;
-  * Update context to reflect the concatenation of another buffer full
-  * of bytes.
-  */
-void MD5Update(ctx, buf, len) struct MD5Context *ctx;
-unsigned char *buf;
-unsigned len;
-+void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len)
- {
-   uint32 t;
- 
-@@ -124,8 +121,7 @@ unsigned len;
-  * Final wrapup - pad to 64-byte boundary with the bit pattern
-  * 1 0* (64-bit count of bits processed, MSB-first)
-  */
-void MD5Final(digest, ctx) unsigned char digest[16];
-struct MD5Context *ctx;
-+void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
- {
-   unsigned count;
-   unsigned char *p;
-@@ -186,8 +182,7 @@ struct MD5Context *ctx;
-  * reflect the addition of 16 longwords of new data.  MD5Update blocks
-  * the data and converts bytes into longwords for this routine.
-  */
-void MD5Transform(buf, in) uint32 buf[4];
-uint32 in[16];
-+void MD5Transform(uint32 buf[4], uint32 in[16])
- {
-   register uint32 a, b, c, d;
- 
-diff --git a/decoder_sw/software/test/common/swhw/md5.h b/decoder_sw/software/test/common/swhw/md5.h
-index 516400236606..c1d773093b66 100755
--- a/decoder_sw/software/test/common/swhw/md5.h
-+++ b/decoder_sw/software/test/common/swhw/md5.h
-@@ -76,10 +76,10 @@ struct MD5Context {
-   unsigned char in[64];
- };
- 
-extern void MD5Init();
-extern void MD5Update();
-extern void MD5Final();
-extern void MD5Transform();
-+extern void MD5Init(struct MD5Context *ctx);
-+extern void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len);
-+extern void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
-+extern void MD5Transform(uint32 buf[4], uint32 in[16]);
- 
- /*
-  * This is needed to make RSAREF happy on some MS-DOS compilers.
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
index d766e0191..e5113f1c1 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
@@ -1,19 +1,17 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2020,2026 NXP
 DESCRIPTION = "i.MX Hantro VPU library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 PROVIDES = "virtual/imxvpu"
 SRC_URI = " \
    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
-    file://0001-test-md5-convert-to-ansi-c.patch \
-    file://0001-basetype.h-make-header-compatible-with-c23.patch \
 "
-IMX_SRCREV_ABBREV = "194a305"
+IMX_SRCREV_ABBREV = "52c7e45"
-SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7"
+SRC_URI[sha256sum] = "cdfb28cdec4e26ef84ee8c54be89a1da269eaeb4b51eafe689eb084ac20c7d84"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
@@ -43,7 +41,5 @@ do_install () {
 FILES:${PN} += "/unit_tests"
-RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
deleted file mode 100644
index 012e1f2b7..000000000
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2020-2024 NXP
-DESCRIPTION = "Basler camera binary drivers"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-IMX_SRCREV_ABBREV = "dd86758"
-inherit fsl-eula-unpack
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[sha256sum] = "aa86adeb0c53c3306f7e1c004ffa78ebb7db3e9136c78759e4029b4b5e1b1a64"
-S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
-do_compile[noexec] = "1"
-do_install() {
-    oe_runmake install INSTALL_DIR=${D}
-    dest_dir=${D}/opt/imx8-isp/bin
-    install -d ${D}/${libdir}
-    install -d $dest_dir
-    cp -r ${S}/opt/imx8-isp/bin/* $dest_dir
-    cp -r ${S}/usr/lib/* ${D}/${libdir}
-}
-SYSTEMD_AUTO_ENABLE = "enable"
-FILES:${PN} = "${libdir} /opt"
-INSANE_SKIP:${PN} = "already-stripped"
-RDEPENDS:${PN} += "isp-imx"
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
new file mode 100644
index 000000000..11580dfd2
--- /dev/null
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
@@ -0,0 +1,29 @@
+# Copyright 2020-2024 NXP
+DESCRIPTION = "Basler camera binary drivers"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+IMX_SRCREV_ABBREV = "dd86758"
+inherit fsl-eula-unpack
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI[sha256sum] = "4c3cfc96833a7d8462f71589152ef7f9c8fcc9badbb925bbc120431f8c5ee3b5"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+do_compile[noexec] = "1"
+do_install() {
+    oe_runmake install INSTALL_DIR=${D}
+}
+SYSTEMD_AUTO_ENABLE = "enable"
+FILES:${PN} = "${libdir} /opt"
+INSANE_SKIP:${PN} = "already-stripped"
+RDEPENDS:${PN} += "isp-imx"
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
deleted file mode 100644
index 617abde6f..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 38b3b6b02..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0002-appshell-cmake-bump-min-version-to-3.5.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 5b69b60bd4d0d5ed1474c6457561d48cdbabc778 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 09:19:58 +0000
-Subject: [PATCH 2/5] appshell: cmake: bump min version to 3.5
-CMake 4 no longer supports min version set to before 3.5
-|  CMake Error at CMakeLists.txt:28 (cmake_minimum_required):
-|    Compatibility with CMake < 3.5 has been removed from CMake.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- appshell/CMakeLists.txt                        | 2 +-
- appshell/display/CMakeLists.txt                | 2 +-
- appshell/display/wayland-client/CMakeLists.txt | 2 +-
- appshell/v4l_drm_test/CMakeLists.txt           | 2 +-
- appshell/vvext/CMakeLists.txt                  | 2 +-
- appshell/yuv/CMakeLists.txt                    | 2 +-
- units/CMakeLists.txt                           | 2 +-
- units/isi/CMakeLists.txt                       | 2 +-
- units/isi/drv/OS08a20/CMakeLists.txt           | 2 +-
- units/isi/drv/OS08a20/calib/CMakeLists.txt     | 2 +-
- 10 files changed, 10 insertions(+), 10 deletions(-)
-diff --git a/appshell/CMakeLists.txt b/appshell/CMakeLists.txt
-index 22092ce975b5..cf14e254c812 100644
--- a/appshell/CMakeLists.txt
-+++ b/appshell/CMakeLists.txt
-@@ -25,7 +25,7 @@
- # *****************************************************************************/
- 
- 
-cmake_minimum_required(VERSION 3.1.0)
-+cmake_minimum_required(VERSION 3.5.0)
- project(ISP_APP_SHELL)
- 
- if(DEFINED QTLESS)
-diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
-index 491f086adf55..458a46b165b4 100755
--- a/appshell/display/CMakeLists.txt
-+++ b/appshell/display/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.6)
- 
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
- 
-diff --git a/appshell/display/wayland-client/CMakeLists.txt b/appshell/display/wayland-client/CMakeLists.txt
-index 78247528b0e4..0639d79d8346 100644
--- a/appshell/display/wayland-client/CMakeLists.txt
-+++ b/appshell/display/wayland-client/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.6)
- 
- set(WAYLAND_XML_PRIFIX ${SDKTARGETSYSROOT}/usr/share/wayland-protocols)
- set(GEN_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/display/wayland-client)
-diff --git a/appshell/v4l_drm_test/CMakeLists.txt b/appshell/v4l_drm_test/CMakeLists.txt
-index cf4685c84204..309e5d465e99 100755
--- a/appshell/v4l_drm_test/CMakeLists.txt
-+++ b/appshell/v4l_drm_test/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- project(ISP_V4L_DRM_TEST)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-diff --git a/appshell/vvext/CMakeLists.txt b/appshell/vvext/CMakeLists.txt
-index a5d6c12929fa..63c1eb5f7073 100755
--- a/appshell/vvext/CMakeLists.txt
-+++ b/appshell/vvext/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- project(ISP_V4L_DRM_TEST)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-diff --git a/appshell/yuv/CMakeLists.txt b/appshell/yuv/CMakeLists.txt
-index 131766fcb5d4..0f3591918e08 100755
--- a/appshell/yuv/CMakeLists.txt
-+++ b/appshell/yuv/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- set (CMAKE_CXX_FLAGS_DEBUG "")
- set (CMAKE_C_FLAGS_DEBUG "")
- 
-diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt
-index 37fa65ed4ea8..10abbef1c16c 100755
--- a/units/CMakeLists.txt
-+++ b/units/CMakeLists.txt
-@@ -24,7 +24,7 @@
- # *
- # *****************************************************************************/
- 
-cmake_minimum_required(VERSION 3.1.0)
-+cmake_minimum_required(VERSION 3.5.0)
- project(ISPcore_SW_STACK)
- if( NOT DEFINED APPSHELL_TOP_COMPILE)
- 
-diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
-index a91699b4a1a5..ea01aa7d9424 100755
--- a/units/isi/CMakeLists.txt
-+++ b/units/isi/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- # define module name
- set (module isi)
-diff --git a/units/isi/drv/OS08a20/CMakeLists.txt b/units/isi/drv/OS08a20/CMakeLists.txt
-index d27dc97f7945..12c6e9ef993a 100755
--- a/units/isi/drv/OS08a20/CMakeLists.txt
-+++ b/units/isi/drv/OS08a20/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- # define module name & interface version
- set (module os08a20)
-diff --git a/units/isi/drv/OS08a20/calib/CMakeLists.txt b/units/isi/drv/OS08a20/calib/CMakeLists.txt
-index b44b08248135..18119086b967 100755
--- a/units/isi/drv/OS08a20/calib/CMakeLists.txt
-+++ b/units/isi/drv/OS08a20/calib/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- # use upper level module name
- 
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch b/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch
deleted file mode 100644
index f11deb758..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From db07010535d47d7d7eaf3865d97dcec045e19930 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 09:57:22 +0000
-Subject: [PATCH 3/5] appshell: cmake: drop deprecated use of
- target_link_libraries
-Works around:
-| CMake Error at display/CMakeLists.txt:48 (target_link_libraries):
-|   Cannot specify link libraries for target "wayland-client" which is not
-|   built by this project.
-caused by CMake 4 deprecating https://cmake.org/cmake/help/v3.5/policy/CMP0016.html
-CMP0016 states that the command is silently ignored, thus drop it.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- appshell/display/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
-index 458a46b165b4..160755312368 100755
--- a/appshell/display/CMakeLists.txt
-+++ b/appshell/display/CMakeLists.txt
-@@ -43,7 +43,6 @@ if (WAYLAND_SUPPORT)
-     file(GLOB pub_headers *.h)
-     file(GLOB libsources *.cpp ./wayland-client/*.c)
-     include_directories(./wayland-client)
-    target_link_libraries(wayland-client)
- else (WAYLAND_SUPPORT)
-     file(GLOB pub_headers *.h)
-     file(GLOB libsources *.cpp)
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch b/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch
deleted file mode 100644
index 087f24090..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0004-units-targets.cmake-fix-check-if-a-target-exists.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d7e06f57c067e50d86369577b8dc3bccdde6fd40 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 10:44:40 +0000
-Subject: [PATCH 4/5] units/targets.cmake: fix check if a target exists
-| CMake Error at units/targets.cmake:35 (get_target_property):
-|   get_target_property() called with non-existent target "lib".
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- units/targets.cmake | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-diff --git a/units/targets.cmake b/units/targets.cmake
-index 663a024d9129..d78dbf8b8a45 100755
--- a/units/targets.cmake
-+++ b/units/targets.cmake
-@@ -32,8 +32,7 @@ add_dependencies(create_alldir ${module}_create_dir)
- # Settings for target LIB
- ###############################################################################
- # check if lib target already exists and create it, this is to assure that only one target called lib will be generated
-get_target_property(LIB_TARGET lib TYPE)
-if(NOT LIB_TARGET)
-+if(NOT TARGET lib)
-     add_custom_target(lib)
- endif()
- # the library itself is a dependency for the target lib
-@@ -83,8 +82,7 @@ if(HAVE_PUBLIC_HEADERS)
- endif()
- 
- # check if lib_install target already exists and create it
-get_target_property(LIB_INSTALL_TARGET lib_install TYPE)
-if(NOT LIB_INSTALL_TARGET)
-+if(NOT TARGET lib_install)
-     add_custom_target(lib_install)
- endif()
- 
-@@ -104,8 +102,7 @@ add_custom_target(${module}_copy_header
-                     COMMENT "Copying Headers of ${module}")
- 
- # check if copy_header target already exists and create it
-get_target_property(COPY_HEADER_TARGET copy_header TYPE)
-if(NOT COPY_HEADER_TARGET)
-+if(NOT TARGET copy_header)
-     add_custom_target(copy_header)
- endif()
- # if copy_header is selected, modulename_copy_header target must be created
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch b/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch
deleted file mode 100644
index f4b44ff47..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0005-units-cmake-fix-use-of-add_dependencies.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 72d6160d1efc9df8bdee4e3dc9da67560f2206b4 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Fri, 25 Jul 2025 10:52:52 +0000
-Subject: [PATCH 5/5] units: cmake: fix use of add_dependencies
-With CMake 4 we get during configure:
-| CMake Error at isp-imx/4.2.2.25.2/sources/isp-imx-4.2.2.25.2-3cac1fb:
-|   The dependency target "drv/OS08a20" of target "copy_shell_libs_isi" does
-|   not exist.
-Comment out that the add_dependencies. The driver for OS08a20 is still
-part of the built packages.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- units/isi/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
-index ea01aa7d9424..2f5c3d803e67 100755
--- a/units/isi/CMakeLists.txt
-+++ b/units/isi/CMakeLists.txt
-@@ -93,7 +93,7 @@ add_custom_target(copy_shell_libs_${module} ALL
-        COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*/*.cfg  ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
-        COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*.cfg  ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
- )
-add_dependencies(copy_shell_libs_${module} drv/OS08a20)
-+#add_dependencies(copy_shell_libs_${module} os08a20_shared)
- 
- endif (GENERATE_PARTITION_BUILD)
- 
-- 
-2.42.0
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
index 445822528..e8f8e46d7 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
@@ -1,24 +1,17 @@
-# Copyright (C) 2020-2024 NXP
+# Copyright 2020-2025 NXP
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
-SRC_URI = " \
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+SRC_URI[sha256sum] = "ab04d9eae4917591ca21f4ae13269c4e5a6f1b8e2f357cca1693682fa9a87249"
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ISP_SYSTEMD_PATCH}', '', d)} \
-    file://0002-appshell-cmake-bump-min-version-to-3.5.patch \
-    file://0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch \
-    file://0004-units-targets.cmake-fix-check-if-a-target-exists.patch \
-    file://0005-units-cmake-fix-use-of-add_dependencies.patch \
-"
-ISP_SYSTEMD_PATCH = "file://0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch"
-IMX_SRCREV_ABBREV = "3cac1fb"
+IMX_SRCREV_ABBREV = "3cbd4a2"
-S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "8fa5094da6438505287f4dcc8033dad3057ab81bf98c858884f7c3a2e521b252"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack cmake pkgconfig systemd use-imx-headers
@@ -52,18 +45,9 @@ EXTRA_OECMAKE += " \
    -D3A_SRC_BUILD=0 \
    -DIMX_G2D=ON \
    -Wno-dev \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
 "
-do_configure_disable:prepend () {
-    # FIXME: should be rebuild.
-    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/bin/isp_media_server
-    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/lib/libmedia_server.so
-    patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/tuningext/install/tuningext
-    # FIXME: Should be rebuild.
-    patchelf --replace-needed libtinyxml2.so.10 libtinyxml2.so.11 ${S}/appshell/shell_libs/ispcore/ARM64/libcam_device.so
-}
 do_install() {
    # The Makefile unconditionally installs tuningext even if it is not built
    if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
@@ -80,7 +64,6 @@ do_install() {
        install -d ${D}${systemd_system_unitdir}
        install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
    fi
 }
 # The build contains a mix of versioned and unversioned libraries, so
@@ -97,6 +80,8 @@ FILES_SOLIBS_VERSIONED = " \
    ${libdir}/libos08a20.so \
 "
+INSANE_SKIP:${PN} = "already-stripped"
 RDEPENDS:${PN} = "libdrm"
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
index b1cd3d863..a94d6bf14 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
@@ -8,7 +8,7 @@ SECTION = "base"
 PV .= "+git${SRCPV}"
 SRCBRANCH ?= "master"
-SRCREV = "faf547cc2345bfbf95507ab7e86530f85289bb5b"
+SRCREV = "d44deb80af881b82f394d44696433e6695022c8c"
 SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \
           file://run-ptest \
          "
diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb
index 9fc6338c4..ade3570c4 100644
--- a/recipes-bsp/mxsldr/mxsldr_git.bb
+++ b/recipes-bsp/mxsldr/mxsldr_git.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRCREV = "c40d80472525e1d57dae5317c028b745968c0399"
-SRC_URI = "git://git.denx.de/mxsldr.git;branch=master \
+SRC_URI = "git://source.denx.de/denx/mxsldr.git;branch=master;protocol=https \
           file://0001-Do-not-ignore-OE-cflags-and-ldflags.patch \
           "
diff --git a/recipes-bsp/u-boot/u-boot-imx_2025.04.bb b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
index 27c3555f4..a27291460 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2018 (C) O.S. Systems Software LTDA.
-# Copyright 2017-2024 NXP
+# Copyright 2017-2026 NXP
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
@@ -34,19 +34,31 @@ do_deploy:append:mx8m-generic-bsp() {
                    for key_value in ${UBOOT_DTB_NAME_FLAGS}; do
                        local type_key="${key_value%%:*}"
                        local dtb_name="${key_value#*:}"
+                        local dtb_path=""
                        if [ "$type_key" = "$type" ]
                        then
                            bbnote "UBOOT_CONFIG = $type, UBOOT_DTB_NAME = $dtb_name"
                            # There is only one ${dtb_name}, the first one. All the other are with the type appended
                            if [ ! -f "${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}" ]; then
-                                install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
+                                if [ -f "${B}/${builddir}/arch/arm/dts/${dtb_name}" ]; then
+                                    dtb_path="arch/arm/dts"
+                                elif [ -f "${B}/${builddir}/dts/upstream/src/arm64/freescale/${dtb_name}" ]; then
+                                    dtb_path="dts/upstream/src/arm64/freescale"
+                                else
+                                    bbfatal "DTB '${dtb_name}' not found in expected locations"
+                                fi
+                                bbnote "DTB found at ${B}/${builddir}/${dtb_path}/${dtb_name}"
+                                install -m 0644 ${B}/${builddir}/${dtb_path}/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}
                            else
                                bbwarn "Use custom wks.in for $dtb_name = $type"
                            fi
-                            install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name}  ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
+                            if [ -f "${B}/${builddir}/${dtb_path}/${dtb_name}" ]; then
+                                install -m 0644 ${B}/${builddir}/${dtb_path}/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type}
+                            fi
                        fi
                        unset type_key
                        unset dtb_name
+                        unset dtb_path
                    done
                    unset UBOOT_DTB_NAME_FLAGS
@@ -66,5 +78,10 @@ do_deploy:append:mx93-generic-bsp() {
    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
 }
+do_deploy:append:mx95-generic-bsp() {
+    # Deploy CRT.* from u-boot for stmm
+    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
+}
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp|mx9-generic-bsp)"