46 files changed, 458 insertions, 357 deletions

diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend
index b6194d76b..c31fb04be 100644
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -2,3 +2,4 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 PACKAGE_ARCH:imx-generic-bsp = "${MACHINE_ARCH}"
+PACKAGE_ARCH:qoriq-generic-bsp = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf
index c511018e9..5ed3bdd92 100644
--- a/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf
+++ b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf
@@ -218,8 +218,8 @@ rate 8000
 
 pcm.asymed{
 type asym
-playback.pcm "dmix_44100"
-capture.pcm "dsnoop_44100"
+playback.pcm "dmix_48000"
+capture.pcm "dsnoop_48000"
 }
 
 pcm.dsp0{
diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
index 0084f4a0b..f5918669b 100644
--- a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
+++ b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
@@ -218,8 +218,8 @@ rate 8000
 
 pcm.asymed{
 type asym
-playback.pcm "dmix_44100"
-capture.pcm "dsnoop_44100"
+playback.pcm "dmix_48000"
+capture.pcm "dsnoop_48000"
 }
 
 pcm.dsp0{
diff --git a/recipes-bsp/alsa-state/alsa-state/qoriq-generic-bsp b/recipes-bsp/alsa-state/alsa-state/qoriq-generic-bsp
new file mode 120000
index 000000000..febb30e2c
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/qoriq-generic-bsp
@@ -0,0 +1 @@
+imx-generic-bsp
\ No newline at end of file
diff --git a/recipes-bsp/alsa-state/alsa-state/qoriq-mainline-bsp b/recipes-bsp/alsa-state/alsa-state/qoriq-mainline-bsp
new file mode 120000
index 000000000..b43cbb34c
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/qoriq-mainline-bsp
@@ -0,0 +1 @@
+imx-mainline-bsp
\ No newline at end of file
diff --git a/recipes-bsp/alsa-state/alsa-state/qoriq-nxp-bsp b/recipes-bsp/alsa-state/alsa-state/qoriq-nxp-bsp
new file mode 120000
index 000000000..022b2509e
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/qoriq-nxp-bsp
@@ -0,0 +1 @@
+imx-nxp-bsp
\ No newline at end of file
diff --git a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
index 5cf543ab7..01e3a2a61 100644
--- a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
+++ b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
@@ -6,7 +6,6 @@ inherit deploy fsl-eula-unpack
 
 SRC_URI = "${FSL_MIRROR}/firmware-imx-8.16.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "9ed2923c0eb511c7fcf37dd607944124"
 SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84"
 
 S = "${WORKDIR}/firmware-imx-8.16"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb
deleted file mode 100644
index 70252c01c..000000000
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2023 NXP
-SUMMARY = "NXP i.MX ELE firmware"
-DESCRIPTION = "EdgeLock Enclave firmware for i.MX series SoCs"
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-
-inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "f4df2005ec4555e9f177acbf62a7a969"
-SRC_URI[sha256sum] = "3f69d6cf6ea448c5c2f87b6acdad1c5c2318616d246cc5047a523f2543fee408"
-
-do_compile[noexec] = "1"
-
-do_install() {
-   install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
-   install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
-       install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   fi
-}
-
-do_deploy () {
-    # Deploy the related firmware to be package by imx-boot
-    install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
-}
-addtask deploy after do_install before do_build
-
-PACKAGES += "${PN}-ext"
-
-ALLOW_EMPTY:${PN}-ext = "1"
-
-FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
-FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
-
-RREPLACES:${PN} = "firmware-sentinel"
-RPROVIDES:${PN} = "firmware-sentinel"
-
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb
new file mode 100644
index 000000000..8a812f413
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb
@@ -0,0 +1,42 @@
+# Copyright 2021-2024 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"
+
+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"
+
+S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+
+do_compile[noexec] = "1"
+
+do_install() {
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
+    install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
+        install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    fi
+}
+
+do_deploy () {
+    # Deploy the related firmware to be package by imx-boot
+    install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
+}
+addtask deploy after do_install before do_build
+
+PACKAGES += "${PN}-ext"
+
+ALLOW_EMPTY:${PN}-ext = "1"
+
+FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
+FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
+
+RREPLACES:${PN} = "firmware-sentinel"
+RPROVIDES:${PN} = "firmware-sentinel"
+
+COMPATIBLE_MACHINE = "(mx8ulp-generic-bsp|mx9-generic-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.23.inc b/recipes-bsp/firmware-imx/firmware-imx-8.23.inc
deleted file mode 100644
index bd471f777..000000000
--- a/recipes-bsp/firmware-imx/firmware-imx-8.23.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2022 NXP
-# Copyright (C) 2018 O.S. Systems Software LTDA.
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-
-SRC_URI = " \
-    ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
-"
-
-SRC_URI[md5sum] = "eb03efb3a8fb98d99ed1df88537e72f4"
-SRC_URI[sha256sum] = "fe07633295dac3dd99f0ba4e07a7cde95bb24a29ca82b9a9b3f6026d29ae916a"
-
-S = "${WORKDIR}/firmware-imx-${PV}"
-
-inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.27.inc b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
new file mode 100644
index 000000000..022289d37
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
@@ -0,0 +1,16 @@
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Copyright 2017-2024 NXP
+# Copyright (C) 2018 O.S. Systems Software LTDA.
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+
+# Note: This .inc file is used from differently named recipes, so the package
+# name must be hard-coded, i.e., ${BPN} cannot be used.
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "5af0ceb"
+SRC_URI[sha256sum] = "61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f"
+
+S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
+
+inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb b/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
index a9e36b5e7..7bac8106d 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
@@ -1,23 +1,30 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2021 NXP
+# Copyright 2017-2021,2024 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SUMMARY = "Freescale i.MX firmware"
 DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
 
-require firmware-imx-${PV}.inc
+require ${BP}.inc
 
 PE = "1"
 
 inherit allarch
 
+IMX_USE_LINUX_FIRMWARE_SDMA ?= "1"
+
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/imx
 
     # SDMA Firmware section
     install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma
     install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
-    rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin
-    rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin
+    # Define IMX_USE_LINUX_FIRMWARE_SDMA = "0" in layer.conf, machine.conf, local.conf
+    # or in .bbappend to use sdma-imx6q/7d.bin from here and not linux-firmware
+    if [ ${IMX_USE_LINUX_FIRMWARE_SDMA} -gt 0 ]
+    then
+        rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin
+        rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin
+    fi
 
     # EASRC Firmware section
     install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc
@@ -53,6 +60,11 @@ do_install() {
     # as some of other files are provided by packages from other recipes.
     install -d ${D}${nonarch_base_libdir}/firmware/vpu
     install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu
+    # Update i.MX8 vpu firmware path to align with kernel6.5+
+    install -d ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
+    mv ${D}${nonarch_base_libdir}/firmware/vpu/vpu_fw_imx8* ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
+    # Install i.MX 95 VPU firmware
+    install -m 0644 ${S}/firmware/vpu/wave633c_codec_fw.bin ${D}${nonarch_base_libdir}/firmware
 }
 
 #
@@ -88,15 +100,16 @@ python populate_packages:prepend() {
 
         os.chdir(cwd)
 
+
     easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d)
-    do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin',
+    do_split_packages(d, easrcdir, r'^easrc-([^_]*).*\.bin',
                       output_pattern='firmware-imx-easrc-%s',
                       description='Freescale IMX EASRC Firmware [%s]',
                       extra_depends='',
                       prepend=True)
 
     vpudir = bb.data.expand('${nonarch_base_libdir}/firmware/vpu', d)
-    do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
+    do_split_packages(d, vpudir, r'^vpu_fw_([^_]*).*\.bin',
                       output_pattern='firmware-imx-vpu-%s',
                       description='Freescale IMX VPU Firmware [%s]',
                       hook=coda_vpu_links,
@@ -104,21 +117,21 @@ python populate_packages:prepend() {
                       prepend=True)
 
     sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/sdma', d)
-    do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
+    do_split_packages(d, sdmadir, r'^sdma-([^-]*).*\.bin',
                       output_pattern='firmware-imx-sdma-%s',
                       description='Freescale IMX SDMA Firmware [%s]',
                       extra_depends='',
                       prepend=True)
 
     xcvrdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xcvr', d)
-    do_split_packages(d, xcvrdir, '^xcvr-([^_]*).*\.bin',
+    do_split_packages(d, xcvrdir, r'^xcvr-([^_]*).*\.bin',
                       output_pattern='firmware-imx-xcvr-%s',
                       description='Freescale IMX XCVR Firmware [%s]',
                       extra_depends='',
                       prepend=True)
 
     xuvidir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xuvi', d)
-    do_split_packages(d, xuvidir, '^vpu_fw_([^_]*).*\.bin',
+    do_split_packages(d, xuvidir, r'^vpu_fw_([^_]*).*\.bin',
                       output_pattern='firmware-imx-xuvi-%s',
                       description='Freescale IMX XUVI Firmware [%s]',
                       extra_depends='',
@@ -144,7 +157,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu
 # is empty.
 # Therefore, we opt-out from producing -dev package here, since also for firmware
 # files it makes no sense.
-PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi"
+PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-wave"
 
 FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
 FILES:${PN}-hdmi = " \
@@ -152,5 +165,7 @@ FILES:${PN}-hdmi = " \
     ${nonarch_base_libdir}/firmware/hdmirxfw.bin \
     ${nonarch_base_libdir}/firmware/dpfw.bin \
 "
+FILES:${PN}-vpu-amphion = "${nonarch_base_libdir}/firmware/amphion/vpu/*"
+FILES:${PN}-vpu-wave = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin"
 
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index d28b23821..31c806b02 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 NXP
+# Copyright 2020-2024 NXP
 
 SUMMARY = "Wi-Fi firmware redistributed by NXP"
 DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
@@ -7,11 +7,11 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
 
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "2afa15e77f0b58eade42b4f59c9215339efcca66"
+SRCBRANCH = "lf-6.6.52_2.2.0"
+SRCREV = "2978f3c88d6bcc5695a7b45f1936f18d31eebfa8"
 
 S = "${WORKDIR}/git"
 
@@ -44,7 +44,10 @@ do_install() {
 
     oe_runmake install INSTALLDIR=${D}${nonarch_base_libdir}/firmware/nxp
 
-
+    # Upstream SDIO8997 and IW416 driver firmwares are located on mrvl folder
+    install -d ${D}${nonarch_base_libdir}/firmware/mrvl
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin
+    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin
 }
 
 PACKAGES =+ " \
@@ -59,6 +62,7 @@ PACKAGES =+ " \
     ${PN}-nxp9098-common \
     ${PN}-nxp9098-sdio \
     ${PN}-nxpiw416-sdio \
+    ${PN}-nxpiw610-sdio \
     ${PN}-nxpiw612-sdio \
 "
 
@@ -88,7 +92,7 @@ RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 FILES:${PN}-nxp8997-common = " \
     ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \
     ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \
-    ${nonarch_base_libdir}/firmware/nxp/uartuart8997_bt_v4.bin \
+    ${nonarch_base_libdir}/firmware/nxp/uart8997_bt_v4.bin \
 "
 RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common"
@@ -104,6 +108,7 @@ 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/sdio*8997* \
 "
 RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common"
@@ -114,7 +119,7 @@ RCONFLICTS:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
 FILES:${PN}-nxp9098-common = " \
     ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
     ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \
-    ${nonarch_base_libdir}/firmware/nxp/uartuart9098_bt_v1.bin \
+    ${nonarch_base_libdir}/firmware/nxp/uart9098_bt_v1.bin \
 "
 RDEPENDS:${PN}-nxp9098-common += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
@@ -138,6 +143,7 @@ RREPLACES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RCONFLICTS:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 
 FILES:${PN}-nxpiw416-sdio = " \
+    ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \
     ${nonarch_base_libdir}/firmware/nxp/*iw416* \
 "
 RDEPENDS:${PN}-nxpiw416-sdio += "${PN}-nxp-common"
@@ -145,15 +151,25 @@ RPROVIDES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 
+FILES:${PN}-nxpiw610-sdio += " \
+    ${nonarch_base_libdir}/firmware/nxp/sd_iw610.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/sduart_iw610.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uart_iw610_bt.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartspi_iw610.bin.se \
+"
+RDEPENDS:${PN}-nxpiw610-sdio += "${PN}-nxp-common"
+RPROVIDES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
+RREPLACES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
+RCONFLICTS:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
+
 FILES:${PN}-nxpiw612-sdio = " \
     ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \
+    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_v1.bin.se \
 "
 RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
 RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
-
-COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
index 9778bd1cf..6e6f90cab 100644
--- a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
@@ -8,7 +8,6 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444"
 
 SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz"
-SRC_URI[md5sum] = "f7d277717b3f0dd17e8d341c1091d6b6"
 SRC_URI[sha256sum] = "eb86c90aec92b3b376e7afca6aa5db4767b5d8868553595907ba37665329f16b"
 
 S = "${WORKDIR}/sof-imx-${PV}"
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.23.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
index 246198596..c35e31e07 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.23.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 NXP
+# Copyright (C) 2018-2024 NXP
 SUMMARY = "Freescale i.MX Firmware files used for boot"
 
 require firmware-imx-${PV}.inc
diff --git a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
index 3a7660f86..7592a629c 100644
--- a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
+++ b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
@@ -4,13 +4,12 @@ LICENSE = "Proprietary"
 SECTION = "BSP"
 LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
 inherit fsl-eula-unpack pkgconfig deploy
 
-SRC_URI[md5sum] = "65f28bd8ace3ce7116cb15685bfe1cd0"
 SRC_URI[sha256sum] = "1df3a03d69feb38a450ee63abc7713d78cf6339988476e4c9f95ebbf63790f66"
 
 do_configure[noexec] = "1"
diff --git a/recipes-bsp/imx-atf/imx-atf_2.8.bb b/recipes-bsp/imx-atf/imx-atf_2.10.bb
index 8bd6ad121..ec4088dcd 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.8.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.10.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2023 NXP
+# Copyright (C) 2017-2024 NXP
 
 DESCRIPTION = "i.MX ARM Trusted Firmware"
 SECTION = "BSP"
@@ -8,8 +8,8 @@ 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}"
-SRCBRANCH = "lf_v2.8"
-SRCREV = "8dbe28631802a51b3ec8179b2c5635b00393ad97"
+SRCBRANCH = "lf_v2.10"
+SRCREV = "1b27ee3edbb40ef9432c69ccaa744d1ac5d54c5d"
 
 S = "${WORKDIR}/git"
 
@@ -48,7 +48,9 @@ def remove_options_tail (in_string):
     from itertools import takewhile
     return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' ')))
 
-EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}.bfd"'
+# LD can have linker suffix in its name e.g. aarch64-yoe-linux-ld.lld so we need to
+# drop .lld as well along with options from LD
+EXTRA_OEMAKE += 'LD="${HOST_PREFIX}ld.bfd"'
 
 EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"'
 
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 74b7bddf7..348d717a7 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -13,7 +13,7 @@ PE = "1"
 PV = "5.9+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.1.55_2.2.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
 SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index a761870b5..eae1778c7 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2024 NXP
 
 require imx-mkimage_git.inc
 
@@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "BSP"
 
-inherit use-imx-security-controller-firmware uboot-sign
+inherit use-imx-security-controller-firmware uboot-config
 
 DEPENDS += " \
     u-boot \
@@ -18,14 +18,11 @@ DEPENDS += " \
 # xxd is a dependency of fspi_packer.sh
 DEPENDS += "xxd-native"
 DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native"
-BOOT_NAME = "imx-boot"
-PROVIDES = "${BOOT_NAME}"
+DEPENDS:append:mx93-generic-bsp = " u-boot-mkimage-native dtc-native"
 
 inherit deploy uuu_bootloader_tag
 
-UUU_BOOTLOADER        = "${BOOT_NAME}"
-UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged"
-UUU_BOOTLOADER_UNTAGGED = "${BOOT_NAME}-untagged"
+UUU_BOOTLOADER = "imx-boot"
 
 # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build
 CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}"
@@ -41,14 +38,20 @@ do_compile[depends] += " \
 
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
 
+OEI_ENABLE = "${@bb.utils.contains('DEPENDS', 'virtual/imx-oei', 'YES', 'NO', d)}"
+OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
+
 ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
+BOOT_VARIANT ?= ""
+
 TOOLS_NAME ?= "mkimage_imx8"
 
 IMX_BOOT_SOC_TARGET       ?= "INVALID"
 
 DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
+DEPLOY_OPTEE_STMM = "${@bb.utils.contains('MACHINE_FEATURES', 'optee stmm', 'true', 'false', d)}"
 
 IMXBOOT_TARGETS ?= \
     "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \
@@ -58,23 +61,33 @@ IMXBOOT_TARGETS ?= \
 BOOT_STAGING       = "${S}/${IMX_BOOT_SOC_TARGET}"
 BOOT_STAGING:mx8m-generic-bsp  = "${S}/iMX8M"
 BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX"
-BOOT_STAGING:mx9-generic-bsp   = "${S}/iMX9"
+BOOT_STAGING:mx91-generic-bsp  = "${S}/iMX91"
+BOOT_STAGING:mx93-generic-bsp  = "${S}/iMX93"
+BOOT_STAGING:mx95-generic-bsp  = "${S}/iMX95"
 
 SOC_FAMILY                    = "INVALID"
 SOC_FAMILY:mx8-generic-bsp    = "mx8"
 SOC_FAMILY:mx8m-generic-bsp   = "mx8m"
 SOC_FAMILY:mx8x-generic-bsp   = "mx8x"
 SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
-SOC_FAMILY:mx91p-generic-bsp  = "mx93"
+SOC_FAMILY:mx91-generic-bsp   = "mx91"
 SOC_FAMILY:mx93-generic-bsp   = "mx93"
+SOC_FAMILY:mx95-generic-bsp   = "mx95"
 
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 
-do_uboot_assemble_fitimage:prepend:imx-generic-bsp() {
-    for config in ${UBOOT_MACHINE}; do
-        mkdir -p ${B}/${config}
-    done
-}
+UBOOT_DTB_BINARY ?= "u-boot.dtb"
+MKIMAGE_EXTRA_ARGS ?= ""
+MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
+    OEI=${OEI_ENABLE} \
+    LPDDR_TYPE=${DDR_TYPE} \
+    ${@'LPDDR_FW_VERSION='+d.getVar('LPDDR_FW_VERSION') if d.getVar('LPDDR_FW_VERSION') else ''} \
+    ${@bb.utils.contains('SYSTEM_MANAGER_CONFIG', 'mx95alt', 'MSEL=1', '', d)}"
+MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \
+    ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
+    QSPI_HEADER=./scripts/fspi_header_133"
+
+UBOOT_DTB_BINARY ?= "u-boot.dtb"
 
 compile_mx8m() {
     bbnote 8MQ/8MM/8MN/8MP boot binary build
@@ -90,9 +103,13 @@ compile_mx8m() {
 
     if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
         # Use DTB binary patched with signature node
-        cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA}
+        cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}           ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA}
     else
-        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA}   ${BOOT_STAGING}
+        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \
+                                                             ${BOOT_STAGING}
+    fi
+    if [ "${UBOOT_DTB_NAME_EXTRA}" != "${UBOOT_DTB_NAME}" ] ; then
+        ln -sf ${UBOOT_DTB_NAME_EXTRA}                       ${BOOT_STAGING}/${UBOOT_DTB_NAME}
     fi
 
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
@@ -100,9 +117,10 @@ compile_mx8m() {
 
     cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME}               ${BOOT_STAGING}/bl31.bin
 
-    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA}                     ${BOOT_STAGING}/u-boot.bin
+    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA}               ${BOOT_STAGING}/u-boot.bin
 
 }
+
 compile_mx8() {
     bbnote 8QM boot binary build
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${BOOT_STAGING}/scfw_tcm.bin
@@ -139,6 +157,11 @@ compile_mx8ulp() {
     fi
 }
 
+compile_mx91() {
+    bbnote i.MX 91 boot binary build
+    compile_mx93
+}
+
 compile_mx93() {
     bbnote i.MX 93 boot binary build
     for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
@@ -155,13 +178,30 @@ compile_mx93() {
     fi
 }
 
+compile_mx95() {
+    bbnote i.MX 95 boot binary build
+    compile_mx93
+
+    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
+       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
+}
+
 do_compile() {
     # mkimage for i.MX8
     # Copy TEE binary to SoC target folder to mkimage
     if ${DEPLOY_OPTEE}; then
         cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}
+        if ${DEPLOY_OPTEE_STMM}; then
+            # Copy tee.bin to tee.bin-stmm
+            cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}/tee.bin-stmm
+        fi
     fi
-   for type in ${UBOOT_CONFIG}; do
+    # Copy OEI firmware to SoC target folder to mkimage
+    if [ "${OEI_ENABLE}" = "YES" ]; then
+        cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
+    fi
+
+    for type in ${UBOOT_CONFIG}; do
         if [ "${@d.getVarFlags('UBOOT_DTB_NAME')}" = "None" ]; then
             UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}"
         else
@@ -184,18 +224,30 @@ do_compile() {
                     UBOOT_DTB_NAME_EXTRA="${dtb_name}"
                 fi
                 UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}"
-                BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
+                BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
 
                 for target in ${IMXBOOT_TARGETS}; do
                     compile_${SOC_FAMILY}
-                    if [ "$target" = "flash_linux_m4_no_v2x" ]; then
+                    case $target in
+                    *no_v2x)
                         # Special target build for i.MX 8DXL with V2X off
                         bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}"
                         make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME_EXTRA} flash_linux_m4
-                    else
-                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${target}"
-                        make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME_EXTRA} ${target}
-                    fi
+                        ;;
+                    *stmm_capsule)
+                        # target for flash_evk_stmm_capsule or
+                        # flash_singleboot_stmm_capsule
+                        cp ${RECIPE_SYSROOT_NATIVE}/${bindir}/mkeficapsule ${BOOT_STAGING}
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${target}"
+                        cp ${DEPLOY_DIR_IMAGE}/CRT.* ${BOOT_STAGING}
+                        make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target}
+                        ;;
+                    *)
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} ${target}"
+                        make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} dtbs=${UBOOT_DTB_NAME} ${target}
+                        ;;
+                    esac
+
                     if [ -e "${BOOT_STAGING}/flash.bin" ]; then
                         cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target}
                     fi
@@ -223,7 +275,7 @@ do_install () {
         bbnote "UBOOT_CONFIG = $type"
 
         UBOOT_CONFIG_EXTRA="$type"
-        BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
+        BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
 
         for target in ${IMXBOOT_TARGETS}; do
             install -m 0644 ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} ${D}/boot/
@@ -278,6 +330,10 @@ deploy_mx8ulp() {
     fi
 }
 
+deploy_mx91() {
+    deploy_mx93
+}
+
 deploy_mx93() {
     install -d ${DEPLOYDIR}/${BOOT_TOOLS}
 
@@ -293,6 +349,12 @@ deploy_mx93() {
     fi
 }
 
+deploy_mx95() {
+    deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
+                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
+}
+
 do_deploy() {
     deploy_${SOC_FAMILY}
 
@@ -300,13 +362,27 @@ do_deploy() {
     if ${DEPLOY_OPTEE}; then
        install -m 0644 ${DEPLOY_DIR_IMAGE}/tee.bin ${DEPLOYDIR}/${BOOT_TOOLS}
     fi
+
+    # copy oei to deploy path
+    if [ "${OEI_ENABLE}" = "YES" ]; then
+        install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
+    fi
+
     # copy makefile (soc.mak) for reference
     install -m 0644 ${BOOT_STAGING}/soc.mak                  ${DEPLOYDIR}/${BOOT_TOOLS}
 
+    # copy stmm files to deploy path
+    if ${DEPLOY_OPTEE_STMM}; then
+        install -m 0644 ${BOOT_STAGING}/tee.bin-stmm         ${DEPLOYDIR}/${BOOT_TOOLS}
+        install -m 0644 ${BOOT_STAGING}/capsule1.bin         ${DEPLOYDIR}/${BOOT_TOOLS}
+        install -m 0644 ${BOOT_STAGING}/CRT.*                ${DEPLOYDIR}/${BOOT_TOOLS}
+        install -m 0755 ${BOOT_STAGING}/mkeficapsule         ${DEPLOYDIR}/${BOOT_TOOLS}
+    fi
+
     for type in ${UBOOT_CONFIG}; do
         UBOOT_CONFIG_EXTRA="$type"
         UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}"
-        BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
+        BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin"
 
         if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} ] ; then
             install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
@@ -325,9 +401,9 @@ do_deploy() {
             install -m 0644 ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} ${DEPLOYDIR}
         done
 
-        # The first UBOOT_CONFIG listed will be the ${BOOT_NAME} binary
-        if [ ! -f "${DEPLOYDIR}/${UUU_BOOTLOADER}" ]; then
-            ln -sf ${BOOT_CONFIG_MACHINE_EXTRA}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}
+        # The first UBOOT_CONFIG listed will be the imx-boot binary
+        if [ ! -f "${DEPLOYDIR}/imx-boot" ]; then
+            ln -sf ${BOOT_CONFIG_MACHINE_EXTRA}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/imx-boot
         else
             bbwarn "Use custom wks.in for $UBOOT_CONFIG = $type"
         fi
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index fb3df750a..abc60c9e0 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-2022 NXP
+# Copyright 2017-2023 NXP
 
 DEPENDS = "zlib-native openssl-native"
 
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "cbb99377cc2bb8f7cf213794c030e1c60423ef1f"
+SRCBRANCH = "lf-6.6.52_2.2.0"
+SRCREV = "71b8c18af93a5eb972d80fbec290006066cff24f"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
index 7dc2e593e..c5fa2ee3e 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
@@ -10,7 +10,6 @@ inherit fsl-eula-unpack pkgconfig deploy
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "d608eb2b3d312da1dbde55b8514c1e0f"
 SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f"
 
 BOARD_TYPE ?= "mek"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index b0296e977..353dcb910 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -8,20 +8,20 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011"
 
 DEPENDS = "zlib"
 
-SRCBRANCH = "imx_5.4.70_2.3.11"
+SRCBRANCH = "lf-6.6.3_1.0.0"
 SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-Makefile-Fix-LIBDIR-for-multilib.patch \
            file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch \
            file://0001-add-v2x_test-to-the-installed-binaries.patch \
            file://0001-Fix-return-value-of-void-functions.patch"
-SRCREV = "aa8d62900c41cc779c11fe4e6f58b40c3c9f82f0"
+SRCREV = "273553f207425f773400be7a7f3a7c425d892d6f"
 
 S = "${WORKDIR}/git"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install () {
-        oe_runmake DESTDIR=${D} BINDIR=${bindir} LIBDIR=${libdir} install
+    oe_runmake DESTDIR=${D} BINDIR=${bindir} LIBDIR=${libdir} install
 }
 
 COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb
index f7dadea57..6e8aefdf8 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb
@@ -4,14 +4,13 @@ SUMMARY = "NXP i.MX SECO firmware"
 DESCRIPTION = "Firmware for i.MX Security Controller Subsystem"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "b722a534c4d3cc90270e05eaa812514d"
-SRC_URI[sha256sum] = "c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df"
+SRC_URI[sha256sum] = "9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7"
 
 
 do_compile[noexec] = "1"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
new file mode 100644
index 000000000..cebfbdf91
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -0,0 +1,31 @@
+SUMMARY = "NXP i.MX Secure Enclave Userspace Library"
+DESCRIPTION = "NXP i.MX Secure Enclave Userspace Library"
+SECTION = "base"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
+
+DEPENDS = "openssl"
+
+inherit systemd
+
+SRC_URI = "git://github.com/NXP/imx-secure-enclave.git;protocol=https;branch=lf-6.6.52_2.2.0"
+SRCREV = "dffbb844e86f4a49058ffbb40548474059969c27"
+
+PV = "lf-6.6.52_2.2.0"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE += "PLAT=ele"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_install () {
+    oe_runmake DESTDIR=${D} install
+    rm -rf ${D}/usr/share
+}
+
+SYSTEMD_AUTO_ENABLE = "disable"
+SYSTEMD_SERVICE:${PN} = "nvm_daemon.service"
+
+COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 5d30179d5..930cdf949 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -13,14 +13,15 @@ DEPENDS:append:imxvpu = " virtual/imxvpu"
 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"
 
 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.1.55_2.2.0"
-SRCREV = "e8b3c9026553233491abb4df4185dd7291a8ffb2"
+SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCREV = "8a1fa37664a1e470cf86f1185c08e265e4602a9b"
 
 S = "${WORKDIR}/git"
 
@@ -39,6 +40,8 @@ PLATFORM:mx7d-nxp-bsp  = "IMX7D"
 PLATFORM:mx7ulp-nxp-bsp = "IMX7D"
 PLATFORM:mx8-nxp-bsp = "IMX8"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
+PLATFORM:mx93-nxp-bsp = "IMX8ULP"
+PLATFORM:mx95-nxp-bsp = "IMX8"
 
 PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index 49fc15581..e245f28ba 100644
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -6,8 +6,6 @@ DEPENDS = "virtual/kernel dosfstools-native"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-inherit autotools-brokensep
-
 PR = "r1"
 PV = "0.5.1+git${SRCPV}"
 
@@ -16,6 +14,10 @@ SRCREV = "9b4adc0cde346fbae743dc21fcf5115488307b83"
 
 S = "${WORKDIR}/git"
 
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
 FILES:${PN} += "/linuxrc /fat"
 
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
index 26ebf1816..2e4718c9d 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
@@ -2,16 +2,16 @@
 
 DESCRIPTION = "i.MX VC8000E Encoder library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "c0244a1"
 
-S = "${WORKDIR}/${BPN}-${PV}"
+SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
 
-SRC_URI[md5sum] = "192b354d1c21836dc7338606e60b45ae"
-SRC_URI[sha256sum] = "62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa"
+S = "${WORKDIR}/${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.1.6.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.4.0.bb
index f603190be..e58e2f92e 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.4.0.bb
@@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
 DEPENDS = "imx-vpu-hantro"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 
-SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz"
-SRC_URI[md5sum] = "23997361dab3054e5a3757a15d33db16"
-SRC_URI[sha256sum] = "ac2b60fb754792eedcfdfc8cf59663cfeaedc402857eff13ac97a911d2c65801"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.tar.gz"
+IMX_SRCREV_ABBREV = "75d9dd9"
+
+SRC_URI[sha256sum] = "c3ac36c203fef44ef21c98a90b3fff73af9f328f16b4d85157308848f6c34823"
+
+S = "${WORKDIR}/${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.28.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb
deleted file mode 100644
index 0757a7fb5..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2017-2020 NXP
-
-DESCRIPTION = "i.MX Hantro VPU library"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
-
-PROVIDES = "virtual/imxvpu"
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "81b4eb801349a0c198b7cc43eb8b6097"
-SRC_URI[sha256sum] = "e868e12945b4f217e2e0511fdc2587875d6c9124e8673b67f1e7de367ff5012f"
-
-inherit fsl-eula-unpack use-imx-headers
-
-PARALLEL_MAKE="-j 1"
-
-PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
-PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
-PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
-
-EXTRA_OEMAKE = " \
-    CROSS_COMPILE="${HOST_PREFIX}" \
-    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
-    PLATFORM="${PLATFORM}" \
-"
-
-do_install () {
-    oe_runmake install DEST_DIR="${D}"
-}
-
-FILES:${PN} += "/unit_tests"
-
-RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.35.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.35.0.bb
new file mode 100644
index 000000000..87b4fa53b
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.35.0.bb
@@ -0,0 +1,45 @@
+# Copyright (C) 2017-2020 NXP
+
+DESCRIPTION = "i.MX Hantro VPU library"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+
+PROVIDES = "virtual/imxvpu"
+
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "98ff183"
+
+SRC_URI[sha256sum] = "c4730cb996a3eafbc06ed0765cd509caa63cdeecdc0c4958efbc91383e0501fd"
+
+S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+
+inherit fsl-eula-unpack use-imx-headers
+
+PARALLEL_MAKE="-j 1"
+
+PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
+PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
+PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
+
+#| ../../source/h264high/h264decapi.c:1803:22: error: assignment to 'const u8 *' {aka 'const unsigned char *'} from incompatible pointer type 'u32 *' {aka 'unsigned int *'} [-Wincompatible-pointer-types]
+#|  1803 |             ref_data = ref.virtual_address;
+#| ../../source/h264high/h264decapi.c:2086:22: error: assignment to 'const u8 *' {aka 'const unsigned char *'} from incompatible pointer type 'u32 *' {aka 'unsigned int *'} [-Wincompatible-pointer-types]
+#|  2086 |             ref_data = ref.virtual_address;
+
+CFLAGS += " -Wno-error=incompatible-pointer-types"
+EXTRA_OEMAKE = " \
+    CROSS_COMPILE="${HOST_PREFIX}" \
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
+    PLATFORM="${PLATFORM}" \
+"
+
+do_install () {
+    oe_runmake install DEST_DIR="${D}"
+}
+
+FILES:${PN} += "/unit_tests"
+
+RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
index 383a0e2a9..fc90cdab7 100644
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
@@ -7,12 +7,10 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
 
 PROVIDES = "virtual/imxvpu"
-RPROVIDES:${PN} = "virtual/imxvpu"
 
 PE = "1"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "6d6302189a6704874375afe62a65def0"
 SRC_URI[sha256sum] = "87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127"
 
 inherit fsl-eula-unpack use-imx-headers
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb
index 0ab440748..59ba1c619 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb
@@ -8,7 +8,6 @@ inherit fsl-eula-unpack
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "31d716e1f40c248556e5a8e6b467ba71"
 SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf"
 
 do_install() {
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch b/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch
deleted file mode 100644
index 3f04000cf..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 15aae364fb52df30e4a49e73e2048fdc633e6868 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Sun, 8 Oct 2023 09:15:54 -0300
-Subject: [PATCH] cpp-netlib: parsers.ipp: add missing include
-
-With the update to boost from 1.82.0 -> 1.83.0 we now get compiler errors:
-
-| .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:58:3: error: 'u8_to_u32_iterator' was not declared in this scope
-
-Add the missing explicit include. Before the file was indirectly included from qi.hpp:
-
-| In file included from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/regex/pending/unicode_iterator.hpp:27,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/utf8.hpp:15,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/info.hpp:17,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/domain.hpp:16,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/meta_compiler.hpp:15,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action/action.hpp:14,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action.hpp:14,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi.hpp:14,
-|                  from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/include/qi.hpp:16,
-|                  from .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:5,
-
-Upstream-Status: Pending
-
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- .../boost/network/protocol/http/server/impl/parsers.ipp          | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
-index c31e60e..2b83fbe 100755
---- a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
-+++ b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
-@@ -13,6 +13,7 @@
- #include <tuple>
- #include <boost/fusion/include/std_tuple.hpp>
- #include <boost/network/protocol/http/message/header.hpp>
-+#include <boost/regex/pending/unicode_iterator.hpp>
- 
- #ifdef BOOST_NETWORK_NO_LIB
- #ifndef BOOST_NETWORK_INLINE
--- 
-2.35.3
-
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb
deleted file mode 100644
index 9e0f02656..000000000
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2023 NXP
-
-DESCRIPTION = "i.MX Verisilicon Software ISP"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
-DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 patchelf-native"
-
-SRC_URI = " \
-    ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
-    file://0001-cpp-netlib-parsers.ipp-add-missing-include.patch \
-"
-
-SRC_URI[sha256sum] = "34b23f5b9f0856a8f5722e339a7ad4ccf4d99614788598306ff8b20093c1e846"
-
-inherit fsl-eula-unpack cmake systemd use-imx-headers
-
-# Build the sub-folder appshell
-OECMAKE_SOURCEPATH = "${S}/appshell"
-
-# Use make instead of ninja
-OECMAKE_GENERATOR = "Unix Makefiles"
-
-# Workaround for linking issues seen with gold linker
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-
-SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
-
-EXTRA_OECMAKE += " \
-    -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
-    -DCMAKE_BUILD_TYPE=release \
-    -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-    -DCMAKE_INSTALL_LIBDIR=${libdir} \
-    -DISP_VERSION=ISP8000NANO_V1802 \
-    -DPLATFORM=ARM64 \
-    -DAPPMODE=V4L2 \
-    -DTUNINGEXT=1 \
-    -DQTLESS=1 \
-    -DFULL_SRC_COMPILE=1 \
-    -DWITH_DRM=1 \
-    -DWITH_DWE=1 \
-    -DSERVER_LESS=1 \
-    -DSUBDEV_V4L2=1 \
-    -DENABLE_IRQ=1 \
-    -DPARTITION_BUILD=0 \
-    -D3A_SRC_BUILD=0 \
-    -DIMX_G2D=ON \
-    -Wno-dev \
-"
-
-do_configure:prepend () {
-    # FIXME: Should be rebuild.
-    patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/units/cam_device/proprietories/lib/libcam_device.so
-    patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/mediacontrol/lib/arm-64/fpga/libcam_device.so
-}
-
-do_install() {
-    # FIXME: provided by the basler-camera package, do not install them here additionally
-    rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json
-
-    install -d ${D}/${libdir}
-    install -d ${D}/${includedir}
-    install -d ${D}/opt/imx8-isp/bin
-    install -d ${D}/opt/imx8-isp/bin/dewarp_config
-
-    cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/tuningext ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
-    cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
-
-    cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir}
-    cp -r ${B}/generated/release/include/* ${D}/${includedir}
-
-    cp -r ${S}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin
-    cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin
-    cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin
-
-    chmod +x ${D}/opt/imx8-isp/bin/run.sh
-    chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh
-
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-      install -d ${D}${systemd_system_unitdir}
-      install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
-    fi
-}
-
-# The build contains a mix of versioned and unversioned libraries, so
-# the default packaging configuration needs some modification so that
-# unversioned .so libraries go to the main package and versioned .so
-# symlinks go to -dev.
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
-FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
-FILES_SOLIBS_VERSIONED = " \
-    ${libdir}/libcppnetlib-client-connections.so \
-    ${libdir}/libcppnetlib-server-parsers.so \
-    ${libdir}/libcppnetlib-uri.so \
-    ${libdir}/libjsoncpp.so \
-    ${libdir}/libos08a20.so \
-"
-
-RDEPENDS:${PN} = "libdrm"
-
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.4.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.4.bb
new file mode 100644
index 000000000..c8dc1402f
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.4.bb
@@ -0,0 +1,88 @@
+# Copyright 2020-2023 NXP
+
+DESCRIPTION = "i.MX Verisilicon Software ISP"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
+
+SRC_URI = " \
+    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+"
+IMX_SRCREV_ABBREV = "8527c7b"
+S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+
+SRC_URI[sha256sum] = "481e49e9da6d7783d6c28385bb68463eac7b9e9fef6ea958950260a8ad6b1e4c"
+
+inherit fsl-eula-unpack cmake systemd use-imx-headers
+
+PACKAGECONFIG = "tuningext"
+# Note: building with tuningext fails with boost 1.87.
+# (update to 1.87 with walnascar)
+PACKAGECONFIG[tuningext] = "-DTUNINGEXT=1,-DTUNINGEXT=0"
+
+# Build the sub-folder appshell
+OECMAKE_SOURCEPATH = "${S}/appshell"
+
+# Use make instead of ninja
+OECMAKE_GENERATOR = "Unix Makefiles"
+
+# Workaround for linking issues seen with gold linker
+LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
+
+EXTRA_OECMAKE += " \
+    -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
+    -DCMAKE_BUILD_TYPE=release \
+    -DISP_VERSION=ISP8000NANO_V1802 \
+    -DPLATFORM=ARM64 \
+    -DQTLESS=1 \
+    -DFULL_SRC_COMPILE=1 \
+    -DWITH_DRM=1 \
+    -DWITH_DWE=1 \
+    -DSUBDEV_V4L2=1 \
+    -DPARTITION_BUILD=0 \
+    -D3A_SRC_BUILD=0 \
+    -DIMX_G2D=ON \
+    -Wno-dev \
+"
+
+do_install() {
+    # FIXME: provided by the basler-camera package, do not install them here additionally
+    rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json
+
+    # The Makefile unconditionally installs tuningext even if it is not built
+    if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
+        touch ${B}/generated/release/bin/tuningext
+    fi
+
+    oe_runmake -f ${S}/Makefile install INSTALL_DIR=${D} SOURCE_DIR=${S}
+
+    if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
+        rm ${D}/opt/imx8-isp/bin/tuningext
+    fi
+
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
+    fi
+
+}
+
+# The build contains a mix of versioned and unversioned libraries, so
+# the default packaging configuration needs some modification so that
+# unversioned .so libraries go to the main package and versioned .so
+# symlinks go to -dev.
+FILES_SOLIBSDEV = ""
+FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
+FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
+FILES_SOLIBS_VERSIONED = " \
+    ${libdir}/libcppnetlib-client-connections.so \
+    ${libdir}/libcppnetlib-server-parsers.so \
+    ${libdir}/libcppnetlib-uri.so \
+    ${libdir}/libos08a20.so \
+"
+
+RDEPENDS:${PN} = "libdrm"
+
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
index b160c31db..ccca3f0e8 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
@@ -61,7 +61,9 @@ PACKAGECONFIG:append:imxpxp           = " pxp"
 # former is not available pre-5.6. Out of the dma-heaps, we
 # pick the uncached one by default (see above).
 PACKAGECONFIG:append:mx8-nxp-bsp      = " dma-heap-uncached"
-PACKAGECONFIG:append:mx8m-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mq-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mm-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mp-nxp-bsp     = " dwl"
 
 HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2"
 
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index 568096c44..696307209 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "dtc-native"
 inherit deploy
 
 SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1"
-SRCREV = "8efeeac253ff780cbf1382ff40e09436d65e220d"
+SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
index c01bfd4c5..bb542e8c0 100644
--- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
+++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
@@ -13,10 +13,10 @@ SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234"
 S = "${WORKDIR}/git"
 
 do_install () {
-    install -d ${D}/lib/firmware
+    install -d ${D}${nonarch_base_libdir}/firmware
     install -d ${D}/boot/engine-pfe-bin
-    install -m 644 ${S}/NXP-Binary-EULA.txt ${D}/lib/firmware
-    install -m 755 ${S}/ls1012a/slow_path/*.elf ${D}/lib/firmware
+    install -m 644 ${S}/NXP-Binary-EULA.txt ${D}${nonarch_base_libdir}/firmware
+    install -m 755 ${S}/ls1012a/slow_path/*.elf ${D}${nonarch_base_libdir}/firmware
     install -m 755 ${S}/ls1012a/u-boot/* ${D}/boot/engine-pfe-bin
 }
 
@@ -27,7 +27,7 @@ do_deploy () {
 
 addtask deploy after do_install
 
-FILES:${PN} += "/lib/firmware /boot/"
+FILES:${PN} += "${nonarch_base_libdir}/firmware /boot/"
 INSANE_SKIP:${PN} += "arch already-stripped"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
index 33648d1e2..8562f38bc 100644
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "qe microcode binary"
 SECTION = "qe-ucode"
 LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=c62f8109b4df15ca37ceeb5e4943626c"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c62f8109b4df15ca37ceeb5e4943626c"
 
 inherit deploy
 
 SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1;protocol=https"
-SRCREV= "57401f6dff6507055558eaa6838116baa8a2fd46"
+SRCREV= "c89d7843943fd3bd52aa5f1ff7a91200a2f7f63b"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 5721313b2..a4ad982b1 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "tcl-native"
 inherit deploy siteinfo
 
 SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1"
-SRCREV = "020dcf0645959afec6705f518e8350476891ef4f"
+SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
index b270dfd74..134028503 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
@@ -10,10 +10,11 @@ DEPENDS += "flex-native bison-native"
 
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
 
-SRCREV = "1a2bdc16b79a6f9c31829ede1bbf4063ccea6e54"
-SRCBRANCH = "2024.04+fslc"
+SRCREV = "aa4bc52d08c342df83e3c576e2c108d7c8816e0e"
+SRCBRANCH = "2025.01+fslc"
 
-PV = "2024.04+git${SRCPV}"
+PV = "2025.01+fslc+git${SRCPV}"
+CVE_PRODUCT = "denx:u-boot"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
index b7e4ca760..b7e4ca760 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
index eba8876aa..4dc698219 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
@@ -6,8 +6,6 @@ order to provide support for some backported features and fixes, or because it \
 was submitted for revision and it takes some time to become part of a stable \
 version, or because it is not applicable for upstreaming."
 
-inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
-
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
 
 PROVIDES += "u-boot u-boot-mfgtool"
@@ -21,5 +19,8 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
                  HOSTLDFLAGS="${BUILD_LDFLAGS}" \
                  HOSTSTRIP=true'
 
+inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
+inherit uuu_bootloader_tag
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
index e23235627..39ac4135a 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
@@ -4,9 +4,10 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf_v2023.04"
-LOCALVERSION ?= "-imx_v2023.04_6.6.3-1.0.0"
-SRCREV = "f8a2983ec83afd43731d905b4ff0ffd57b57f2f0"
+SRCBRANCH = "lf_v2024.04"
+LOCALVERSION ?= "-imx_v2024.04_6.6.52-2.2.0"
+SRCREV = "6c4545203d123c246c5d7995f2893959506d28e0"
+CVE_PRODUCT = "nxp:uboot_secondary_program_loader denx:u-boot"
 
 DEPENDS += " \
     bc-native \
diff --git a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
index 0e7c467b9..29d835278 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2018 (C) O.S. Systems Software LTDA.
-# Copyright (C) 2017-2023 NXP
+# Copyright (C) 2017-2024 NXP
 
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
@@ -9,15 +9,10 @@ PROVIDES += "u-boot u-boot-mfgtool"
 
 inherit uuu_bootloader_tag
 
-UUU_BOOTLOADER                          = ""
-UUU_BOOTLOADER:mx6-generic-bsp          = "${UBOOT_BINARY}"
-UUU_BOOTLOADER:mx7-generic-bsp          = "${UBOOT_BINARY}"
-UUU_BOOTLOADER_TAGGED                   = ""
-UUU_BOOTLOADER_TAGGED:mx6-generic-bsp   = "u-boot-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_TAGGED:mx7-generic-bsp   = "u-boot-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_UNTAGGED                 = ""
-UUU_BOOTLOADER_UNTAGGED:mx6-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_UNTAGGED:mx7-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
+# The UUU tag goes on the boot partition. For 8+, the boot partition image
+# is imx-boot, so disable UUU-tagging here
+UUU_BOOTLOADER:mx8-generic-bsp = ""
+UUU_BOOTLOADER:mx9-generic-bsp = ""
 
 do_deploy:append:mx8m-generic-bsp() {
     # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
@@ -57,6 +52,14 @@ do_deploy:append:mx8m-generic-bsp() {
         done
         unset  i
     fi
+
+    # Deploy CRT.* from u-boot for stmm
+    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
+}
+
+do_deploy:append:mx93-generic-bsp() {
+    # Deploy CRT.* from u-boot for stmm
+    install -m 0644 ${S}/CRT.*     ${DEPLOYDIR}
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index b001a325c..268b5b1d9 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315"
 inherit deploy
 
 SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https"
-SRCREV = "15deb924ff063007592ee647602dd454353f5aee"
+SRCREV = "55789d536850e00c6f2284fb28eaf21712cd276b"
 
 S = "${WORKDIR}/git"