15 files changed, 280 insertions, 31 deletions

diff --git a/LICENSE b/LICENSE
index 54f54150..3278ee0e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -9,7 +9,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/boot-format/boot-format_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-bsp/ddr-phy/ddr-phy_git.bb: LICENSE = "NXP-Binary-EULA"
 ./recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb: LICENSE = "Proprietary"
-./recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.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"
@@ -22,7 +22,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/imx-mkimage/imx-mkimage_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb: LICENSE = "Proprietary"
 ./recipes-bsp/imx-seco/imx-seco-libs_git.bb: LICENSE = "Proprietary"
-./recipes-bsp/imx-seco/imx-seco_5.9.4.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"
@@ -142,10 +142,10 @@ LICENSE_FLAGS = "commercial"
 ./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.0.bb: LICENSE = "Proprietary"
 ./recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb: LICENSE = "Proprietary"
-./recipes-multimedia/imx-dsp/imx-dsp_2.1.9.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.6.0.bb: LICENSE = "Proprietary"
-./recipes-multimedia/imx-parser/imx-parser_4.9.2.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"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb
index 8a812f41..d9a6218e 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb
@@ -1,15 +1,15 @@
-# Copyright 2021-2024 NXP
+# 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=ca53281cc0caa7e320d4945a896fb837"
+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 = "17945fc"
-SRC_URI[sha256sum] = "8791109824767346237e53ac2c712824e54608e2092859161e6bb3e5385a7595"
+IMX_SRCREV_ABBREV = "19b6ee2"
+SRC_URI[sha256sum] = "14ad172ed70d2f16decca4b55e508dad32923390a298f10a598e8bc7778b6b66"
 
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
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 31c806b0..e713336e 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -7,11 +7,11 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
+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.52_2.2.0"
-SRCREV = "2978f3c88d6bcc5695a7b45f1936f18d31eebfa8"
+SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCREV = "eef7ef94bc44cacd3b068f66658ef33391547daa"
 
 S = "${WORKDIR}/git"
 
@@ -19,6 +19,8 @@ inherit allarch
 
 CLEANBROKEN = "1"
 ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-all-sdio = "1"
+ALLOW_EMPTY:${PN}-all-pcie = "1"
 
 do_compile() {
         :
@@ -173,3 +175,17 @@ 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"
+
+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/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index abc60c9e..ad464aee 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,12 +1,12 @@
-# Copyright 2017-2023 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.52_2.2.0"
-SRCREV = "71b8c18af93a5eb972d80fbec290006066cff24f"
+SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCREV = "9e60b1f7a87a6397cf8db10e07293075f489e974"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.4.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
index 6e8aefdf..352fc49e 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.4.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb
@@ -1,17 +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=10c0fda810c63b052409b15a5445671a"
+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[sha256sum] = "9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7"
+SRC_URI[sha256sum] = "bd8dc01966076836aabff53f2463295294166595006e1db430db21b6ffa6b667"
+IMX_SRCREV_ABBREV = "0333596"
 
+S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 
 do_compile[noexec] = "1"
 
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 00000000..8d017ab7
--- /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.10.1.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
index 2e4718c9..5aaf92c5 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
@@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.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"
 
 SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
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 00000000..bbfec172
--- /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 00000000..da1af2b9
--- /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.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
index 645d2554..3a171942 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
@@ -6,7 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 
 PROVIDES = "virtual/imxvpu"
 
-SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+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"
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 00000000..1750d624
--- /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.6.bb
index dbf4442c..41c337c4 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.6.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.6.bb
@@ -7,7 +7,10 @@ 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 = " \
+    git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
+    file://0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch \
+"
 SRCBRANCH = "lf-6.6.y"
 LOCALVERSION = "-6.6.52-2.2.0"
 SRCREV = "e0f9e2afd4cff3f02d71891244b4aa5899dfc786"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.9.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
index 73321ddc..4e42110b 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.9.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
@@ -2,16 +2,16 @@
 
 DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
-IMX_SRCREV_ABBREV = "a3074e2"
+IMX_SRCREV_ABBREV = "ea4fe3f"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
-SRC_URI[sha256sum] = "1f763c21f20abfbb013a0d1acb5846fec55241e9fa8c8aae47fd95b007d800fe"
+SRC_URI[sha256sum] = "fc6e6a7c2417730b39eeddc26606c3d58a8f5d0a1521f44bbbd505657046858b"
 
 EXTRA_OECONF = " \
     -datadir=${base_libdir}/firmware \
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.6.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb
index 7f0c2256..07ea662c 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.6.0.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb
@@ -2,13 +2,13 @@
 DESCRIPTION = "NXP Multimedia opencl converter lib"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+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 = "605ef75"
+IMX_SRCREV_ABBREV = "ad0094a"
 
-SRC_URI[sha256sum] = "777f49805d5455ebc27e63d19552e2924174011d2ae7d9b392febfa8794d4dc6"
+SRC_URI[sha256sum] = "d23ad4234f34ffcfb37d77c91345b935894937913a68995223d2f9f421eade46"
 
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack autotools pkgconfig meson
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.9.2.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.3.bb
index 78b48da0..15df0aeb 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.9.2.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=ca53281cc0caa7e320d4945a896fb837"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -14,10 +14,10 @@ RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
 
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "828fcb7"
+IMX_SRCREV_ABBREV = "c296eb2"
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
-SRC_URI[sha256sum] = "7414db9e2cce2cb2d6fe63ac7d193a0ea65ad8a184e6a2e2ce2785e43acbb339"
+SRC_URI[sha256sum] = "997a7f79f291ef4b3c8dd3ba6f2f32c430c63feb4bb29d923f71da0d1ccf20a9"
 
 inherit fsl-eula-unpack autotools pkgconfig