130 files changed, 1179 insertions, 1655 deletions

diff --git a/EULA b/EULA
index 5a03801a9..37ddcbd5e 100644
--- a/EULA
+++ b/EULA
@@ -1,4 +1,4 @@
-LA_OPT_NXP_Software_License v62 May 2025
+LA_OPT_NXP_Software_License v63 May 2025
 IMPORTANT.  Read the following NXP Software License Agreement ("Agreement")
 completely. By selecting the "I Accept" button at the end of this page, or by
 downloading, installing, or using the Licensed Software, you indicate that you
@@ -15,9 +15,9 @@ supersede this Agreement.
 NXP SOFTWARE LICENSE AGREEMENT
 This is a legal agreement between your employer, of which you are an authorized
 representative, or, if you have no employer, you as an individual ("you" or
-"Licensee"), and and NXP USA, Inc., if Licensee is located within the United
-States or NXP Semiconductors Netherlands B.V., if Licensee if located outside
-of the United States (“NXP”).  It concerns your rights to use the software
+"Licensee"), and NXP USA, Inc., if Licensee is located within the United States
+or NXP Semiconductors Netherlands B.V., if Licensee if located outside of the
+United States (“NXP”).  It concerns your rights to use the software
 provided to you in binary or source code form and any accompanying written
 materials (the "Licensed Software"). The Licensed Software may include any
 updates or error corrections or documentation relating to the Licensed Software
@@ -516,6 +516,13 @@ distribution of one copy embedded in a single NXP Product. Your use of Cadence
 NatureDSP Libraries whether in source code or in binary is restricted to NXP
 SoC based systems or emulation enablement based on NXP SoC.
 
+Use of the XA NN library is limited to execution on Cadence processor cores and
+not permitted non-Cadence platforms.  Redistribution is permitted only as part
+of an NXP SOC based product and must include all copyright and permission
+notices.  The library is provided “as is” without warranties, and no rights
+are granted to any third-party technologies that may be required for use.  Full
+license terms are available from Cadence Design Systems, Inc.
+
 CEVA D.S.P. Ltd. And CEVA Technologies Inc. ("CEVA"): The CEVA-SPF2 linear
 algebra, CEVA-SPF2 Neural Network Libraries, CEVA-SPF2 Core Libraries,
 CEVA-SPF2 OpenAMP and CEVA-SPF2 STL licensed modules are owned by CEVA and such
diff --git a/LICENSE b/LICENSE
index 08b431efe..67b326c9c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@
 This file lists all licenses used by recipes in the meta-freescale layer.
 
 ./dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb: LICENSE = "BSD-3-Clause"
-./dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb: LICENSE = "BSD-3-Clause"
+./dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2025q4.bb: LICENSE = "BSD-3-Clause"
 ./dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb: LICENSE = "MIT"
 ./recipes-bsp/atf/qoriq-atf-2.12.inc: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/boot-format/boot-format_git.bb: LICENSE = "GPL-2.0-only"
@@ -23,7 +23,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb: LICENSE = "Proprietary"
 ./recipes-bsp/imx-seco/imx-seco-libs_git.bb: LICENSE = "Proprietary"
 ./recipes-bsp/imx-seco/imx-seco_5.9.4.1.bb: LICENSE = "Proprietary"
-./recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb: LICENSE = "BSD-3-Clause"
+./recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/imx-test/imx-test_00.00.00.bb: LICENSE = "MIT"
 ./recipes-bsp/imx-test/imx-test_git.bb: LICENSE = "GPL-2.0-or-later"
 ./recipes-bsp/imx-uuc/imx-uuc_git.bb: LICENSE = "GPL-2.0-only"
@@ -42,14 +42,15 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/qe-ucode/qe-ucode_git.bb: LICENSE = "NXP-Binary-EULA"
 ./recipes-bsp/rcw/rcw_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc: LICENSE = "GPL-2.0-or-later"
-./recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc: LICENSE = "GPL-2.0-or-later"
+./recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc: LICENSE = "GPL-2.0-or-later"
 ./recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb: LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only"
 ./recipes-bsp/uefi/uefi_git.bb: LICENSE = "NXP-Binary-EULA"
+./recipes-connectivity/mbedtls/mbedtls_3.6.5.bb: LICENSE = "Apache-2.0 | GPL-2.0-or-later"
 ./recipes-core/udev/udev-rules-imx.bb: LICENSE = "MIT"
 ./recipes-core/udev/udev-rules-qoriq.bb: LICENSE = "MIT"
 ./recipes-devtools/devregs/devregs_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb: LICENSE = "LGPL-2.1-only"
-./recipes-devtools/qemu/qemu.inc: LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+./recipes-devtools/qemu/qemu-qoriq.inc: LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 ./recipes-devtools/qoriq-cst/qoriq-cst_git.bb: LICENSE = "BSD-3-Clause"
 ./recipes-devtools/utp-com/utp-com_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-devtools/uuu/uuu-bin_1.5.233.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
@@ -73,14 +74,13 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-dpaa2/restool/restool_git.bb: LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
 ./recipes-dpaa2/spc/spc_git.bb: LICENSE = "MIT"
 ./recipes-extended/crconf/crconf_git.bb: LICENSE = "GPL-2.0-only"
-./recipes-extended/dpdk/dpdk-20.11.inc: LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
-./recipes-extended/dpdk/dpdk_19.11-20.12.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
+./recipes-extended/dpdk/dpdk_22.11.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
 ./recipes-extended/jailhouse/jailhouse-imx_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-extended/libpkcs11/libpkcs11_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-extended/merge-files/merge-files_1.0.bb: LICENSE = "MIT"
 ./recipes-extended/odp/odp.inc: LICENSE = "BSD-3-Clause"
 ./recipes-extended/ofp/ofp_git.bb: LICENSE = "BSD-3-Clause"
-./recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb: LICENSE = "BSD"
+./recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb: LICENSE = "Apache-2.0"
 ./recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb: LICENSE = "BSD"
 ./recipes-extended/secure-obj/secure-obj.inc: LICENSE = "BSD-3-Clause"
 ./recipes-extended/skmm-ep/skmm-ep_git.bb: LICENSE = "BSD & GPL-2.0-only"
@@ -105,31 +105,20 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-kernel/ceetm/ceetm_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/kernel-modules/kernel-module-ar_git.bb: LICENSE = "GPL-2.0-only & BSD"
 ./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb: LICENSE = "GPL-2.0-only"
-./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/kernel-modules/kernel-module-ipc.inc: LICENSE = "BSD"
-./recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb: LICENSE = "GPL-2.0-or-later"
 ./recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb: LICENSE = "GPL-2.0-only"
-./recipes-kernel/linux/linux-imx-headers_6.12.bb: LICENSE = "GPL-2.0-only"
+./recipes-kernel/linux/linux-imx-headers_6.18.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/linux/linux-imx.inc: LICENSE = "GPL-2.0-only"
+./recipes-kernel/linux/linux-imx_6.18.bb: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/linux/linux-qoriq.inc: LICENSE = "GPL-2.0-only"
 ./recipes-kernel/skmm-host/skmm-host_git.bb: LICENSE = "BSD & GPL-2.0-or-later"
 ./recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb: LICENSE = "Apache-2.0"
 ./recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb: LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-3-Clause"
 ./recipes-multimedia/alsa/imx-alsa-plugins_git.bb: LICENSE = "GPL-2.0-only"
-./recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb: LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & ISC & MIT & BSD-2-Clause & BSD-3-Clause & IJG"
-LICENSE:${PN} = "GPL-2.0-or-later"
-LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libpostproc = "GPL-2.0-or-later"
-LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE_FLAGS = "commercial"
 ./recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
 ./recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb: LICENSE = "LGPL-2.0-or-later"
 ./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb: LICENSE_FLAGS = "commercial"
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index f8861cd14..db9d9a412 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -64,6 +64,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57 = "ca53281cc0caa7e320d4945a
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58 = "c0fb372b5d7f12181de23ef480f225f3"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8cbc32a25a"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62 = "a93b654673e1bc8398ed1f30e0813359"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63 = "bc649096ad3928ec06a8713b8d787eac"
 
 FSL_EULA_FILE_MD5SUMS = " \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
@@ -124,11 +125,12 @@ FSL_EULA_FILE_MD5SUMS = " \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62} \
+    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63} \
 "
 
 # The checksum for the EULA in the layer
 FSL_EULA_FILE_MD5SUM ?= \
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62}"
+    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63}"
 
 LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
 LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 7c9f34927..57ec558c6 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -1,6 +1,6 @@
 #
 # This class provides a support to build the boot container for
-# i.MX8M derivatives
+# i.MX8M and i.MX95 derivatives
 #
 # imx8m machines require a separate build target to be executed
 # due to the fact that final boot image is constructed using flash.bin
@@ -23,15 +23,23 @@
 # NOTE: A backwards-compatible symlink is added for 'flash.bin', named
 # 'imx-boot', during the deployment task.
 
+inherit use-imx-security-controller-firmware
+
 # Define ATF binary file to be deployed to the U-Boot build folder
 ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
+OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
+
 IMX_BOOT_CONTAINER_FIRMWARE_SOC ?= ""
 IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = " \
     signed_dp_imx8m.bin \
     signed_hdmi_imx8m.bin \
 "
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = " \
+    ${SECO_FIRMWARE_NAME} \
+    ${OEI_NAME} \
+"
 IMX_BOOT_CONTAINER_FIRMWARE ?= " \
     ${IMX_BOOT_CONTAINER_FIRMWARE_SOC} \
     ${DDR_FIRMWARE_NAME} \
@@ -67,6 +75,9 @@ do_resolve_and_populate_binaries() {
                     if [ "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '1' , '0' , d)}" = "1" ] ; then
                         cp ${DEPLOY_DIR_IMAGE}/${OPTEE_BOOT_IMAGE} ${B}/${builddir}/
                     fi
+                    if [ -n "${SYSTEM_MANAGER_FIRMWARE_NAME}" ]; then
+                        cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin ${B}/${builddir}/m33_image.bin
+                    fi
                 fi
             done
             unset  j
diff --git a/conf/fragments/eula/accept-fsl-eula.conf b/conf/fragments/eula/accept-fsl-eula.conf
new file mode 100644
index 000000000..933feaa00
--- /dev/null
+++ b/conf/fragments/eula/accept-fsl-eula.conf
@@ -0,0 +1,12 @@
+# Accept Freescale/NXP EULA
+#
+# By setting this variable, you indicate that you have read and accepted
+# the terms in the Freescale/NXP Software License Agreement located at:
+# ${LAYERDIR}/EULA
+#
+# This is required to build recipes that use proprietary NXP software.
+
+BB_CONF_FRAGMENT_SUMMARY = "Accept Freescale/NXP EULA"
+BB_CONF_FRAGMENT_DESCRIPTION = "This fragment sets the ACCEPT_FSL_EULA variable to '1', indicating acceptance of the Freescale/NXP EULA."
+
+ACCEPT_FSL_EULA = "1"
diff --git a/conf/fragments/graphics/framebuffer.conf b/conf/fragments/graphics/framebuffer.conf
new file mode 100644
index 000000000..80fdd0416
--- /dev/null
+++ b/conf/fragments/graphics/framebuffer.conf
@@ -0,0 +1,9 @@
+# FrameBuffer Configuration Fragment
+#
+# This fragment configures the build for framebuffer graphical backend.
+# It removes all competing backends (X11, Wayland, DirectFB, Vulkan).
+
+BB_CONF_FRAGMENT_SUMMARY = "Enable FrameBuffer backend"
+BB_CONF_FRAGMENT_DESCRIPTION = "Configures framebuffer-based graphics rendering by removing X11, Wayland, DirectFB, and Vulkan backends."
+
+DISTRO_FEATURES:remove = "x11 wayland directfb vulkan"
diff --git a/conf/fragments/graphics/vulkan.conf b/conf/fragments/graphics/vulkan.conf
new file mode 100644
index 000000000..c2599a762
--- /dev/null
+++ b/conf/fragments/graphics/vulkan.conf
@@ -0,0 +1,8 @@
+# Vulkan Configuration Fragment
+#
+# This fragment enables the Vulkan graphics API in the build.
+
+BB_CONF_FRAGMENT_SUMMARY = "Enable Vulkan graphics API"
+BB_CONF_FRAGMENT_DESCRIPTION = "Enables Vulkan support in the build by adding vulkan to DISTRO_FEATURES."
+
+DISTRO_FEATURES:append = " vulkan"
diff --git a/conf/fragments/graphics/wayland.conf b/conf/fragments/graphics/wayland.conf
new file mode 100644
index 000000000..fcdb0896e
--- /dev/null
+++ b/conf/fragments/graphics/wayland.conf
@@ -0,0 +1,10 @@
+# Wayland Configuration Fragment
+#
+# This fragment configures the build for the Wayland display backend.
+# It removes X11 and DirectFB support and enables Wayland and PAM features.
+
+BB_CONF_FRAGMENT_SUMMARY = "Enable Wayland display backend"
+BB_CONF_FRAGMENT_DESCRIPTION = "Enables Wayland display backend while removing X11 and DirectFB support. Use together with the systemd init fragment."
+
+DISTRO_FEATURES:remove = "directfb x11"
+DISTRO_FEATURES:append = " wayland pam"
diff --git a/conf/fragments/graphics/xwayland.conf b/conf/fragments/graphics/xwayland.conf
new file mode 100644
index 000000000..4f1aeac5b
--- /dev/null
+++ b/conf/fragments/graphics/xwayland.conf
@@ -0,0 +1,10 @@
+# XWayland Configuration Fragment
+#
+# This fragment configures the build for Wayland with XWayland support.
+# It enables both X11 and Wayland backends.
+
+BB_CONF_FRAGMENT_SUMMARY = "Enable Wayland with XWayland support"
+BB_CONF_FRAGMENT_DESCRIPTION = "Enables both X11 and Wayland display backends with XWayland support while removing DirectFB. Use together with the systemd init fragment."
+
+DISTRO_FEATURES:remove = "directfb"
+DISTRO_FEATURES:append = " x11 wayland pam"
diff --git a/conf/fragments/init/systemd.conf b/conf/fragments/init/systemd.conf
new file mode 100644
index 000000000..bd48fc4c0
--- /dev/null
+++ b/conf/fragments/init/systemd.conf
@@ -0,0 +1,8 @@
+# Systemd Init Manager Fragment
+#
+# This fragment sets the init manager to systemd.
+
+BB_CONF_FRAGMENT_SUMMARY = "Use systemd init manager"
+BB_CONF_FRAGMENT_DESCRIPTION = "Sets the init manager to systemd instead of the default SysVinit."
+
+INIT_MANAGER = "systemd"
diff --git a/conf/layer.conf b/conf/layer.conf
index 4b0a5f77f..ad2f52d75 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "freescale-layer"
 BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_freescale-layer = "5"
-LAYERSERIES_COMPAT_freescale-layer = "whinlatter"
+LAYERSERIES_COMPAT_freescale-layer = "whinlatter wrynose"
 LAYERDEPENDS_freescale-layer = "core"
 
 # Add the Freescale-specific licenses into the metadata
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index cecb97d27..f6946b771 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -17,9 +17,9 @@ UBOOT_MAKE_TARGET = "u-boot.sb"
 UBOOT_SUFFIX = "sb"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
+UBOOT_CONFIG[sd] = "mx28evk_config"
 UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
-UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
+UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config"
 
 KERNEL_DEVICETREE = "nxp/mxs/imx28-evk.dtb"
 
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 61d81ab69..08c5e8452 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -56,8 +56,8 @@ UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx"
 
-UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
-UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
+UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig"
 UBOOT_CONFIG[eimnor]   = "${UBOOT_CONFIG_MACHINE_NAME}_eimnor_defconfig"
 UBOOT_CONFIG[nand]     = "${UBOOT_CONFIG_MACHINE_NAME}_nand_defconfig,ubifs"
 UBOOT_CONFIG[spinor]   = "${UBOOT_CONFIG_MACHINE_NAME}_spinor_defconfig"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index c65bc9b91..48609ef84 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -62,8 +62,8 @@ UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx"
 
-UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
-UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
+UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig"
 UBOOT_CONFIG[sata]     = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig"
 
 # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index df022d635..3f9c2f6a2 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -24,8 +24,8 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6slevk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6slevk_optee_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6slevk_config"
+UBOOT_CONFIG[sd-optee] = "mx6slevk_optee_config"
 UBOOT_CONFIG[epdc]     = "mx6slevk_epdc_config"
 UBOOT_CONFIG[spinor]   = "mx6slevk_spinor_config"
 
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 58fff6db0..2e93d8f26 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -21,8 +21,8 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6sllevk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6sllevk_config"
+UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config"
 UBOOT_CONFIG[epdc]     = "mx6sllevk_epdc_config"
 
 OPTEE_BIN_EXT:imx6sllevk = "6sllevk"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index cbb20d567..e4b5a6835 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -19,8 +19,8 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6sxsabreauto_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6sxsabreauto_optee_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6sxsabreauto_config"
+UBOOT_CONFIG[sd-optee] = "mx6sxsabreauto_optee_config"
 UBOOT_CONFIG[qspi1]    = "mx6sxsabreauto_qspi1_config"
 UBOOT_CONFIG[nand]     = "mx6sxsabreauto_nand_config,ubifs"
 
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index d85c7ce74..de4281320 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -32,9 +32,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6sxsabresd_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6sxsabresd_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6sxsabresd_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6sxsabresd_config"
+UBOOT_CONFIG[sd-optee] = "mx6sxsabresd_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6sxsabresd_emmc_config"
 UBOOT_CONFIG[qspi2]    = "mx6sxsabresd_qspi2_config"
 UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
 
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 3bab4f549..35b99c8ce 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -57,9 +57,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6ul_14x14_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6ul_14x14_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6ul_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6ul_14x14_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx6ul_14x14_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6ul_14x14_evk_emmc_config"
 UBOOT_CONFIG[qspi1]    = "mx6ul_14x14_evk_qspi1_config"
 
 OPTEE_BIN_EXT = "6ulevk"
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index 4c1184a79..a9ff8bf10 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -39,9 +39,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6ull_14x14_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6ull_14x14_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6ull_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6ull_14x14_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx6ull_14x14_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6ull_14x14_evk_emmc_config"
 UBOOT_CONFIG[nand]     = "mx6ull_14x14_evk_nand_config,ubifs"
 UBOOT_CONFIG[qspi1]    = "mx6ull_14x14_evk_qspi1_config"
 
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index 572434ae7..25b0d0d06 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -32,9 +32,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6ulz_14x14_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6ulz_14x14_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6ulz_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6ulz_14x14_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx6ulz_14x14_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6ulz_14x14_evk_emmc_config"
 UBOOT_CONFIG[nand]     = "mx6ulz_14x14_evk_nand_config,ubifs"
 UBOOT_CONFIG[qspi1]    = "mx6ulz_14x14_evk_qspi1_config"
 
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 96942ebb2..9f88dc4fd 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -33,9 +33,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx7dsabresd_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx7dsabresd_optee_config,sdcard"
-UBOOT_CONFIG[nonsec]   = "mx7dsabresd_nonsec_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx7dsabresd_config"
+UBOOT_CONFIG[sd-optee] = "mx7dsabresd_optee_config"
+UBOOT_CONFIG[nonsec]   = "mx7dsabresd_nonsec_config"
 UBOOT_CONFIG[qspi1]    = "mx7dsabresd_qspi1_config"
 UBOOT_CONFIG[nand]     = "mx7dsabresd_nand_config,ubifs"
 UBOOT_CONFIG[epdc]     = "mx7dsabresd_epdc_config"
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index b5196e30b..569548d56 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -36,9 +36,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx7ulp_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx7ulp_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx7ulp_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx7ulp_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx7ulp_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx7ulp_evk_emmc_config"
 
 OPTEE_BIN_EXT = "7ulp"
 
diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf
index 467ca8630..afb3ca29d 100644
--- a/conf/machine/imx8mm-ddr4-evk.conf
+++ b/conf/machine/imx8mm-ddr4-evk.conf
@@ -8,6 +8,7 @@ require include/imx8mm-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191-cmd-ram.dtb \
diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf
index 1387e594b..ae81a92d4 100644
--- a/conf/machine/imx8mm-lpddr4-evk.conf
+++ b/conf/machine/imx8mm-lpddr4-evk.conf
@@ -20,10 +20,10 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524-lpv.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
 "
 
diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf
index 7a796d38d..7b3682217 100644
--- a/conf/machine/imx8mn-ddr4-evk.conf
+++ b/conf/machine/imx8mn-ddr4-evk.conf
@@ -8,6 +8,7 @@ require include/imx8mn-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"
diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index f0488912f..a71ec3019 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -34,7 +34,7 @@ UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG_BASENAME      = "imx8mn_ddr3l_evk"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_config,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_config"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
@@ -72,4 +72,8 @@ IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mnddr3l_m7_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_hello_world.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_sai_low_power_audio.bin \
 "
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index cc461a1aa..8a80cfd61 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -34,17 +34,16 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-os08a20-ov5640.dtb \
     freescale/imx8mp-evk-ov2775.dtb \
     freescale/imx8mp-evk-ov2775-ov5640.dtb \
-    freescale/imx8mp-evk-pcie-ep.dtb \
     freescale/imx8mp-evk-revA3-8mic-revE.dtb \
+    freescale/imx8mp-evk-revb4-rm692c9.dtb \
+    freescale/imx8mp-evk-rm692c9.dtb \
     freescale/imx8mp-evk-rm67191.dtb \
     freescale/imx8mp-evk-rm67199.dtb \
     freescale/imx8mp-evk-root.dtb \
     freescale/imx8mp-evk-rpmsg.dtb \
-    freescale/imx8mp-evk-rpmsg-lpv.dtb \
     freescale/imx8mp-evk-sof-pdm.dtb \
     freescale/imx8mp-evk-sof-wm8960.dtb \
     freescale/imx8mp-evk-spdif-lb.dtb \
-    freescale/imx8mp-evk-usdhc1-m2.dtb \
     freescale/imx8mp-evk-8mic-swpdm.dtb \
 "
 
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index ff56e386d..9e5c27b43 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -28,13 +28,15 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
         freescale/imx8mq-evk-dcss-adv7535.dtb \
         freescale/imx8mq-evk-dcss-rm67191.dtb \
         freescale/imx8mq-evk-dcss-rm67199.dtb \
+        freescale/imx8mq-evk-dcss-rm692c9.dtb \
         freescale/imx8mq-evk-dp.dtb \
         freescale/imx8mq-evk-dual-display.dtb \
         freescale/imx8mq-evk-inmate.dtb \
         freescale/imx8mq-evk-lcdif-adv7535.dtb \
         freescale/imx8mq-evk-lcdif-rm67191.dtb \
         freescale/imx8mq-evk-lcdif-rm67199.dtb \
-        freescale/imx8mq-evk-pcie-ep.dtb \
+        freescale/imx8mq-evk-lcdif-rm692c9.dtb \
+        freescale/imx8mq-evk-pcie1-ep.dtb \
         freescale/imx8mq-evk-pcie1-m2.dtb \
         freescale/imx8mq-evk-pdm.dtb \
         freescale/imx8mq-evk-root.dtb \
@@ -49,7 +51,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]       = "imx8mq_evk_config,sdcard"
+UBOOT_CONFIG[sd]       = "imx8mq_evk_config"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
 
@@ -104,4 +106,7 @@ IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mq_m4_TCM_hello_world.bin \
     mcore-demos/imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mq_m4_DDR_hello_world.bin \
+    mcore-demos/imx8mq_m4_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mq_m4_DDR_rpmsg_lite_str_echo_rtos.bin \
 "
diff --git a/conf/machine/imx8mq-lpddr4-wevk.conf b/conf/machine/imx8mq-lpddr4-wevk.conf
index 6aa8e0ee7..e66eda2f4 100644
--- a/conf/machine/imx8mq-lpddr4-wevk.conf
+++ b/conf/machine/imx8mq-lpddr4-wevk.conf
@@ -8,7 +8,7 @@ MACHINEOVERRIDES =. "imx8mq-evk:"
 require conf/machine/imx8mq-evk.conf
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "imx8mq_wevk_config,sdcard"
+UBOOT_CONFIG[sd] = "imx8mq_wevk_config"
 
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index 56ede4326..bb65ae13e 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -39,10 +39,9 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-enet2-tja1100.dtb \
     freescale/imx8qm-mek-hdmi.dtb \
     freescale/imx8qm-mek-hdmi-rx.dtb \
-    freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \
+    freescale/imx8qm-mek-hdmi-rx.dtbo \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/imx8qm-mek-pcie-ep.dtb \
     freescale/imx8qm-mek-rpmsg.dtb \
     freescale/imx8qm-mek-sof.dtb \
     freescale/imx8qm-mek-sof-cs42888.dtb \
@@ -52,6 +51,8 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-max9286-csi0.dtb \
     freescale/imx8qm-mek-max9286-csi1.dtb \
     freescale/imx8qm-mek-max9286-dual.dtb \
+    freescale/imx8qm-mek-pcie0-ep.dtb \
+    freescale/imx8qm-mek-pcie0-ep-rpmsg.dtb \
     freescale/imx8qm-mek-revd-ca53.dtb \
     freescale/imx8qm-mek-revd-ca72.dtb \
     freescale/imx8qm-mek-revd-dsi-rm67191.dtb \
@@ -59,6 +60,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-revd.dtb \
     freescale/imx8qm-mek-revd-enet2-tja1100.dtb \
     freescale/imx8qm-mek-revd-hdmi.dtb \
+    freescale/imx8qm-mek-revd-hdmi-rx.dtb \
     freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \
     freescale/imx8qm-mek-revd-max9286-csi0.dtb \
@@ -94,7 +96,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]      = "imx8qm_mek_defconfig,sdcard"
+UBOOT_CONFIG[sd]      = "imx8qm_mek_defconfig"
 UBOOT_CONFIG[fspi]    = "imx8qm_mek_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 6763c985e..e6eb2109f 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -26,12 +26,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8962.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-max9286-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-cpi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-cpi-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8qxp_mek"
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index e7ad6d4d3..ea7f84d94 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -24,7 +24,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-reve.dtb \
  "
 
 UBOOT_CONFIG_BASENAME = "imx93_11x11_evk"
@@ -38,7 +38,6 @@ DDR_FIRMWARE_NAME = " \
 
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
-    mcore-demos/imx93-11x11-evk_m33_TCM_low_power_wakeword.bin \
     mcore-demos/imx93-11x11-evk_m33_TCM_power_mode_switch.bin \
     mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index dff843a79..3cb50f282 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-reve.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx93_14x14_evk"
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf
index ef53da5eb..10883f651 100644
--- a/conf/machine/imx93-9x9-lpddr4-qsb.conf
+++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -17,7 +17,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-tianma-wvga-panel.dtb \
 "
 
@@ -33,7 +32,6 @@ DDR_FIRMWARE_NAME = " \
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx93-9x9-qsb_m33_TCM_power_mode_switch.bin \
-    mcore-demos/imx93-9x9-qsb_m33_TCM_low_power_wakeword.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_sai_low_power_audio.bin \
diff --git a/conf/machine/imx943-19x19-lpddr4-evk.conf b/conf/machine/imx943-19x19-lpddr4-evk.conf
new file mode 100644
index 000000000..159aca2dc
--- /dev/null
+++ b/conf/machine/imx943-19x19-lpddr4-evk.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX 943 19x19 Evaluation Kit with LPDDR4
+#@SOC: i.MX943
+#@DESCRIPTION: Machine configuration for NXP i.MX 943 19x19 EVK with LPDDR4
+#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
+
+require conf/machine/include/imx943-evk.inc
+
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+"
+
+UBOOT_CONFIG_BASENAME = "imx943_evk"
+
+OEI_BOARD  ?= "mx943lp4-19"
+DDR_TYPE   = "lpddr4x"
+DDR_FIRMWARE_NAME = " \
+    lpddr4x_dmem_v202409.bin \
+    lpddr4x_dmem_qb_v202409.bin \
+    lpddr4x_imem_v202409.bin \
+    lpddr4x_imem_qb_v202409.bin \
+"
+OEI_DDR_CONFIG     = "MIMX943_LPDDR4_EVK_19X19_4266MTS_FW2024.09_timing"
+OEI_DDR_CONFIG_ECC = "MIMX943_LPDDR4_EVK_19X19_4266MTS_FW2024.09_ECC_enabled_timing"
diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf
index 5ae9ac665..3264324bb 100644
--- a/conf/machine/imx95-19x19-verdin.conf
+++ b/conf/machine/imx95-19x19-verdin.conf
@@ -11,8 +11,8 @@ require conf/machine/include/imx95-evk.inc
 # iMX95 Verdin EVK V1.1E is the first revision with a B0 SoC,
 # older versions require A0/A1 support, set with the below variable
 #IMX_SOC_REV:${MACHINE} = "A0"
-# When building for A0/A1 iMX95 SoCs, set OEI_DDRCONFIG accordingly
-OEI_DDRCONFIG = "${@'XIMX95LPD5EVK19_6400mbps_train_timing_a1' if d.getVar('IMX_SOC_REV')[0] == 'A' else ''}"
+# When building for A0/A1 iMX95 SoCs, set OEI_DDR_CONFIG accordingly
+OEI_DDR_CONFIG = "${@'XIMX95LPD5EVK19_6400mbps_train_timing_a1' if d.getVar('IMX_SOC_REV')[0] == 'A' else ''}"
 
 KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin"
 
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index df3773d2e..8810085d6 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -95,6 +95,7 @@ UBOOT_ENTRYPOINT:mx7-generic-bsp    ?= "0x80008000"
 UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000"
 UBOOT_ENTRYPOINT:mx8m-generic-bsp   ?= "0x40480000"
 UBOOT_ENTRYPOINT:mx93-generic-bsp   ?= "0x80400000"
+UBOOT_ENTRYPOINT:mx943-generic-bsp  ?= "0x80400000"
 UBOOT_ENTRYPOINT:vf-generic-bsp     ?= "0x80008000"
 
 # Some SoC can utilize the boot container provided by U-Boot,
@@ -106,6 +107,9 @@ UBOOT_PROVIDES_BOOT_CONTAINER = "0"
 # IMX_DEFAULT_BOOTLOADER.
 UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}"
 
+# i.MX95 mainline U-Boot uses binman to assemble the boot container.
+UBOOT_PROVIDES_BOOT_CONTAINER:mx95-mainline-bsp = "1"
+
 # Trusted Firmware for Cortex-A (TF-A) can have different providers, either
 # from upstream or from NXP downstream fork. Below variable defines which TF-A
 # shall be taken into the build, and will be integrated into runtime image.
@@ -169,6 +173,7 @@ DEFAULTTUNE:mx8x-generic-bsp   ?= "cortexa35-crypto"
 DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto"
 DEFAULTTUNE:mx91-generic-bsp   ?= "cortexa55"
 DEFAULTTUNE:mx93-generic-bsp   ?= "cortexa55"
+DEFAULTTUNE:mx94-generic-bsp   ?= "cortexa55"
 DEFAULTTUNE:mx95-generic-bsp   ?= "cortexa55"
 
 INHERIT += "machine-overrides-extender"
@@ -227,6 +232,7 @@ MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxd
 
 MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx943:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx94-generic-bsp:mx94-nxp-bsp:mx943-generic-bsp:mx943-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp"
 
 #######
@@ -272,6 +278,7 @@ MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainlin
 
 MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp"
+MACHINEOVERRIDES_EXTENDER:mx943:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx94-generic-bsp:mx94-mainline-bsp:mx943-generic-bsp:mx943-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx95:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx95-generic-bsp:mx95-mainline-bsp"
 
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
@@ -305,6 +312,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
     mx8ulp \
     mx91 \
     mx93 \
+    mx943 \
     mx95 \
 "
 
@@ -335,6 +343,7 @@ MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp  = "-mx8xl"
 MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp  = "-mx8ulp"
 MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp    = "-mx91"
 MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp    = "-mx93"
+MACHINE_SOCARCH_SUFFIX:mx943-nxp-bsp   = "-mx943"
 MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp    = "-mx95"
 
 # For Mainline we use a single SoC suffix as we don't have different build options
@@ -414,6 +423,7 @@ IMX_EXTRA_FIRMWARE:mx8x-generic-bsp   = "imx-sc-firmware imx-seco"
 IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx"
 IMX_EXTRA_FIRMWARE:mx91-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
 IMX_EXTRA_FIRMWARE:mx93-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
+IMX_EXTRA_FIRMWARE:mx943-nxp-bsp      = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
 PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager"
 PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei"
 IMX_EXTRA_FIRMWARE:mx95-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
@@ -455,7 +465,6 @@ MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339',
 MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}"
 MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}"
 MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}"
-MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'firmware-nxp-wifi-bcm4359-pcie', '', d)}"
 
 # Extra NXP Wi-Fi and Bluetooth driver firmware and driver
 MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'firmware-nxp-wifi-nxp8801-sdio', '', d)}"
@@ -507,6 +516,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 # ELE extra Firmware
 SECOEXT_FIRMWARE_NAME ?= "UNDEFINED"
 SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img"
+SECOEXT_FIRMWARE_NAME:mx943-generic-bsp  ?= "mx943${IMX_SOC_REV_LOWER}runtime-ahab-container.img"
 
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN                ?= ""
@@ -543,10 +553,6 @@ PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp       ??= "1.26.0.imx"
 PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp  ??= "1.26.0.imx"
 PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp        ??= "1.26.0.imx"
 
-# GStreamer downgrade ffmpeg
-PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
-PREFERRED_VERSION_ffmpeg:mx9-nxp-bsp ??= "4.4.1"
-
 # Determines if the SoC has support for Vivante kernel driver
 SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT        = "0"
 SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1"
@@ -573,12 +579,18 @@ PREFERRED_PROVIDER_opencl-headers:imxviv       ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-icd-loader:imxviv    ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libopencl1:imxviv   ?= "imx-gpu-viv"
 
+# Set preferred OpenCL ICD runtime
+PREFERRED_RPROVIDER_virtual-opencl-icd         ?= "libopencl-mesa"
+PREFERRED_RPROVIDER_virtual-opencl-icd:imxviv  ?= "libopencl-imx"
+PREFERRED_RPROVIDER_virtual-opencl-icd:imxmali ?= "mali-imx-libopencl"
+
 PREFERRED_PROVIDER_virtual/libg2d              ?= "imx-gpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:imxdpu       ?= "imx-dpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
+PREFERRED_PROVIDER_virtual/libg2d:mx943-nxp-bsp ?= "imx-pxp-g2d"
 
 # Set preferred Vulkan ICD runtime
-PREFERRED_RPROVIDER_virtual-vulkan-icd         ?= "mesa"
+PREFERRED_RPROVIDER_virtual-vulkan-icd         ?= "mesa-vulkan-drivers"
 PREFERRED_RPROVIDER_virtual-vulkan-icd:imxviv  ?= "libvulkan-imx"
 PREFERRED_RPROVIDER_virtual-vulkan-icd:imxmali ?= "mali-imx-libvulkan"
 
@@ -688,5 +700,7 @@ HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum"
 # Add task to generate the mfgtool bundle for the image.
 IMAGE_CLASSES:append:imx-generic-bsp = " image_populate_mfgtool"
 
+SECO_FIRMWARE_NAME:mx943-generic-bsp ?= "mx943${IMX_SOC_REV_LOWER}-ahab-container.img"
+
 # Allow meta-imx to add NIP devices information until upstreamed.
 include conf/machine/include/imx-base-extend.inc
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 4f5d12986..50ee85b42 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -39,7 +39,7 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"
diff --git a/conf/machine/include/imx8dxl-lpddr4-evk.inc b/conf/machine/include/imx8dxl-lpddr4-evk.inc
index b3b906ec7..c19f09eb2 100644
--- a/conf/machine/include/imx8dxl-lpddr4-evk.inc
+++ b/conf/machine/include/imx8dxl-lpddr4-evk.inc
@@ -8,6 +8,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep-rpmsg.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8dxl_evk"
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 516dd8a9d..55718acc3 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -33,7 +33,7 @@ UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_BASENAME}_defconfig"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
 
@@ -77,9 +77,13 @@ MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mm_m4_TCM_hello_world.bin \
-    mcore-demos/imx8mm_m4_TCM_low_power_wakeword.bin \
     mcore-demos/imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mm_m4_TCM_sai_low_power_audio.bin \
     mcore-demos/imx8mm_m4_TCM_sai_low_power_audio_wm8524.bin \
+    mcore-demos/imx8mm_m4_DDR_hello_world.bin \
+    mcore-demos/imx8mm_m4_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mm_m4_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mm_m4_DDR_sai_low_power_audio.bin \
+    mcore-demos/imx8mm_m4_DDR_sai_low_power_audio_wm8524.bin \
 "
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index a51f11edb..d29446125 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -36,7 +36,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi]    = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[ld]      = "${UBOOT_CONFIG_BASENAME}_ld_defconfig"
 
@@ -90,4 +90,8 @@ IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mn_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mn_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mn_m7_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx8mn_m7_DDR_hello_world.bin \
+    mcore-demos/imx8mn_m7_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mn_m7_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mn_m7_DDR_sai_low_power_audio.bin \
 "
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index d6ae21d55..79d7bc15e 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -29,7 +29,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[ecc]     = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
@@ -76,8 +76,11 @@ MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mp_m7_TCM_hello_world.bin \
-    mcore-demos/imx8mp_m7_TCM_low_power_wakeword.bin \
     mcore-demos/imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mp_m7_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx8mp_m7_DDR_hello_world.bin \
+    mcore-demos/imx8mp_m7_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mp_m7_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mp_m7_DDR_sai_low_power_audio.bin \
 "
diff --git a/conf/machine/include/imx8ulp-evk.inc b/conf/machine/include/imx8ulp-evk.inc
index 232695306..7a1f2213d 100644
--- a/conf/machine/include/imx8ulp-evk.inc
+++ b/conf/machine/include/imx8ulp-evk.inc
@@ -19,7 +19,7 @@ UBOOT_MAKE_TARGET = ""
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[nd]   = "${UBOOT_CONFIG_BASENAME}_nd_defconfig"
 
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index e83085860..ad3422e07 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -44,7 +44,7 @@ SPL_BINARY = \
                                                        '', d)}"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index e5a3f0e22..f504694f3 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -23,9 +23,10 @@ UBOOT_MAKE_TARGET = ""
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[ecc]  = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG_IMAGE_FSTYPES[sd] = "sdcard"
 
 # Set ATF platform name
 ATF_PLATFORM = "imx93"
diff --git a/conf/machine/include/imx943-evk.inc b/conf/machine/include/imx943-evk.inc
new file mode 100644
index 000000000..a2abe30dc
--- /dev/null
+++ b/conf/machine/include/imx943-evk.inc
@@ -0,0 +1,120 @@
+MACHINEOVERRIDES =. "mx943:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
+
+MACHINE_FEATURES += "pci wifi bluetooth"
+MACHINE_FEATURES:append:use-nxp-bsp = " crrm optee dpdk nxpiw612-sdio nxp9098-pcie nxpaw693-pcie jailhouse rvgpu-emu"
+
+KERNEL_DEVICETREE_BASENAME = "imx943-evk"
+KERNEL_DEVICETREE = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-crrm.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-netc-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie1-ep.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie1-ep.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-sdwifi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-sgmii.dtb \
+"
+UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
+
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+UBOOT_CONFIG ??= "${@bb.utils.contains('COMBINED_FEATURES', 'crrm', 'crrm', 'sd', d)}"
+UBOOT_CONFIG[sd]     = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[sd-ecc] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[crrm]   = "${UBOOT_CONFIG_BASENAME}_xspi_crrm_defconfig"
+UBOOT_CONFIG[xspi]   = "${UBOOT_CONFIG_BASENAME}_xspi_defconfig"
+UBOOT_CONFIG_IMAGE_FSTYPES[sd]     = "sdcard"
+UBOOT_CONFIG_IMAGE_FSTYPES[sd-ecc] = "sdcard"
+
+ATF_PLATFORM = "imx94"
+OEI_CORE = "m33"
+
+IMXBOOT_VARIANTS = "alt jailhouse rpmsg netc netc_reset netc_standalone"
+# imx943 netc have different mcore demo for different bootloader
+#| |Standard | netc | netc_reset | netc_standalone
+#|--|--|--|--|--|
+#| M33S | imx943evk_cm33_core1_TCM_power_mode_switch.bin | imx943evk_cm33_core1_TCM_netc_share.bin | imx943evk_cm33_core1_TCM_all_reset_but_netc_switch.bin | imx943evk_cm33_core1_TCM_netc_switch_standalone.bin |
+#| M70 | imx943evk_cm7_core0_TCM_power_mode_switch.bin | imx943evk_cm7_core0_TCM_power_mode_switch.bin | imx943evk_cm7_core0_TCM_power_mode_switch.bin | imx943evk_cm7_core0_TCM_power_mode_switch.bin |
+#| M71 | imx943evk_cm7_core1_TCM_power_mode_switch.bin | imx943evk_cm7_core1_TCM_power_mode_switch.bin | imx943evk_cm7_core1_TCM_all_reset_but_netc_trigger.bin | imx943evk_cm7_core1_TCM_power_mode_switch.bin |
+
+M33_IMAGE = "${@bb.utils.contains('IMXBOOT_VARIANT', 'netc',            'imx943evk_cm33_core1_TCM_netc_share.bin', \
+                bb.utils.contains('IMXBOOT_VARIANT', 'netc_reset',      'imx943evk_cm33_core1_TCM_all_reset_but_netc_switch.bin', \
+                bb.utils.contains('IMXBOOT_VARIANT', 'netc_standalone', 'imx943evk_cm33_core1_TCM_netc_switch_standalone.bin', \
+                                                                        'imx943evk_cm33_core1_TCM_power_mode_switch.bin', d), d), d)}"
+M70_IMAGE = "imx943evk_cm7_core0_TCM_power_mode_switch.bin"
+M71_IMAGE = "${@bb.utils.contains('IMXBOOT_VARIANT', 'netc_reset', 'imx943evk_cm7_core1_TCM_all_reset_but_netc_trigger.bin', \
+                                                                   'imx943evk_cm7_core1_TCM_power_mode_switch.bin', d)}"
+
+# Multiple system manager configs by IMXBOOT_VARIANT
+SYSTEM_MANAGER_CONFIG = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',            'mx94alt', \
+                           bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse',       'mx94evkjailhouse', \
+                           bb.utils.contains('IMXBOOT_VARIANT', 'netc',            'mx94evknetc', \
+                           bb.utils.contains('IMXBOOT_VARIANT', 'netc_standalone', 'mx94evknetc', \
+                           bb.utils.contains('IMXBOOT_VARIANT', 'netc_reset',      'mx94evknetc', \
+                           bb.utils.contains('IMXBOOT_VARIANT', 'rpmsg',           'mx94evkrpmsg', \
+                                                                                   'mx94evk', d), d), d), d), d),d) }"
+
+MSEL_TYPE = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       '1', \
+                                                                  '0', d)}"
+
+SYSTEM_MANAGER_FIRMWARE_BASENAME = "m33_image"
+
+IMXBOOT_TARGETS_BASENAME = "flash"
+
+# imx-boot (flash.bin) targets based on UBOOT_CONFIG and IMXBOOT_VARIANT
+IMXBOOT_TARGETS_SD = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',             '${IMXBOOT_TARGETS_BASENAME}_a55', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse',       '${IMXBOOT_TARGETS_BASENAME}_jailhouse', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'netc',            '${IMXBOOT_TARGETS_BASENAME}_all', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'netc_standalone', '${IMXBOOT_TARGETS_BASENAME}_all', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'netc_reset',      '${IMXBOOT_TARGETS_BASENAME}_all', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'rpmsg',           '${IMXBOOT_TARGETS_BASENAME}_a55', \
+                                                                                 '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d), d), d)} \
+"
+
+IMXBOOT_TARGETS = " \
+    ${@bb.utils.contains('UBOOT_CONFIG', 'crrm',   'flash_a55_xspi_crrm', \
+       bb.utils.contains('UBOOT_CONFIG', 'xspi',   'flash_a55_xspi', \
+       bb.utils.contains('UBOOT_CONFIG', 'sd-ecc', '${IMXBOOT_TARGETS_BASENAME}_all', \
+                                                   '${IMXBOOT_TARGETS_SD}', d), d), d)}"
+
+IMX_BOOT_SOC_TARGET = "iMX94"
+IMX_BOOT_SEEK = "32"
+
+# We have to disable SERIAL_CONSOLE due to auto-serial-console
+SERIAL_CONSOLES = "115200;ttyLP0"
+
+IMX_DEFAULT_BSP = "nxp"
+
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-mcore-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx943evk_cm33_core1_TCM_all_reset_but_netc_switch.bin \
+    mcore-demos/imx943evk_cm33_core1_TCM_hello_world.bin \
+    mcore-demos/imx943evk_cm33_core1_TCM_netc_share.bin \
+    mcore-demos/imx943evk_cm33_core1_TCM_netc_switch_standalone.bin \
+    mcore-demos/imx943evk_cm33_core1_TCM_power_mode_switch.bin \
+    mcore-demos/imx943evk_cm33_core1_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx943evk_cm33_core1_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx943evk_cm7_core0_TCM_hello_world.bin \
+    mcore-demos/imx943evk_cm7_core0_TCM_power_mode_switch.bin \
+    mcore-demos/imx943evk_cm7_core0_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx943evk_cm7_core0_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx943evk_cm7_core0_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx943evk_cm7_core1_TCM_all_reset_but_netc_trigger.bin \
+    mcore-demos/imx943evk_cm7_core1_TCM_hello_world.bin \
+    mcore-demos/imx943evk_cm7_core1_TCM_power_mode_switch.bin \
+    mcore-demos/imx943evk_cm7_core1_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx943evk_cm7_core1_TCM_rpmsg_lite_str_echo_rtos.bin \
+"
diff --git a/conf/machine/include/imx95-evk.inc b/conf/machine/include/imx95-evk.inc
index d78745cfc..3cea26090 100644
--- a/conf/machine/include/imx95-evk.inc
+++ b/conf/machine/include/imx95-evk.inc
@@ -18,35 +18,39 @@ UBOOT_MAKE_TARGET = ""
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_evk_defconfig,sdcard"
-UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_evk_fspi_defconfig"
+UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[sd-ecc] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
+UBOOT_CONFIG_IMAGE_FSTYPES[sd] = "sdcard"
 
 ATF_PLATFORM = "imx95"
-OEI_CONFIGS = "ddr tcm"
 OEI_CORE   = "m33"
 OEI_SOC    = "mx95"
 OEI_BOARD  ?= "mx95lp5"
 DDR_TYPE   ?= "lpddr5"
 
-IMXBOOT_VARIANTS = "alt jailhouse netc sof"
+IMXBOOT_VARIANTS = "alt jailhouse netc rpmsg sof"
 
 # Multiple system manager configs by IMXBOOT_VARIANT
 SYSTEM_MANAGER_CONFIG = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       'mx95alt', \
                             bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', 'mx95evkjailhouse', \
                             bb.utils.contains('IMXBOOT_VARIANT', 'netc',      'mx95netc', \
+                            bb.utils.contains('IMXBOOT_VARIANT', 'rpmsg',     'mx95evkrpmsg', \
                             bb.utils.contains('IMXBOOT_VARIANT', 'sof',       'mx95evksof', \
-                                                                              'mx95evk', d), d), d), d)}"
+                                                                              'mx95evk', d), d), d), d), d)}"
 
 # imx-boot (flash.bin) targets based on UBOOT_CONFIG and IMXBOOT_VARIANT
 IMXBOOT_TARGETS_SD = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       '${IMXBOOT_TARGETS_BASENAME}_alt', \
                          bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', '${IMXBOOT_TARGETS_BASENAME}_jailhouse', \
                          bb.utils.contains('IMXBOOT_VARIANT', 'netc',      '${IMXBOOT_TARGETS_BASENAME}_netc', \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'rpmsg',     '${IMXBOOT_TARGETS_BASENAME}_lpboot_sm_a55', \
                          bb.utils.contains('IMXBOOT_VARIANT', 'sof',       '${IMXBOOT_TARGETS_BASENAME}_a55', \
-                                                                           '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d)} \
+                                                                           '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d), d)} \
 "
 
-IMXBOOT_TARGETS = " \
-    ${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_a55_flexspi', '${IMXBOOT_TARGETS_SD}', d)} \
+IMXBOOT_TARGETS = " ${@bb.utils.contains('UBOOT_CONFIG', 'fspi',   '${IMXBOOT_TARGETS_BASENAME}_a55_flexspi', \
+                       bb.utils.contains('UBOOT_CONFIG', 'sd-ecc', '${IMXBOOT_TARGETS_BASENAME}_all', \
+                                                                   '${IMXBOOT_TARGETS_SD}', d), d)} \
 "
 
 IMX_BOOT_SOC_TARGET = "iMX95"
diff --git a/default-registry/configurations/fsl-community-bsp-master.conf.json b/default-registry/configurations/fsl-community-bsp-master.conf.json
new file mode 100644
index 000000000..fa08eacea
--- /dev/null
+++ b/default-registry/configurations/fsl-community-bsp-master.conf.json
@@ -0,0 +1,243 @@
+{
+    "description": "NXP/Freescale Community BSP - master branch configurations",
+    "sources": {
+        "bitbake": {
+            "git-remote": {
+                "remotes": {
+                    "origin": {
+                        "uri": "https://git.openembedded.org/bitbake"
+                    }
+                },
+                "branch": "master",
+                "rev": "master"
+            }
+        },
+        "openembedded-core": {
+            "git-remote": {
+                "remotes": {
+                    "origin": {
+                        "uri": "https://github.com/openembedded/openembedded-core"
+                    }
+                },
+                "branch": "master",
+                "rev": "master"
+            },
+            "path": "openembedded-core"
+        },
+        "meta-yocto": {
+            "git-remote": {
+                "remotes": {
+                    "origin": {
+                        "uri": "https://git.yoctoproject.org/meta-yocto"
+                    }
+                },
+                "branch": "master",
+                "rev": "master"
+            },
+            "path": "meta-yocto"
+        },
+        "meta-openembedded": {
+            "git-remote": {
+                "remotes": {
+                    "origin": {
+                        "uri": "https://github.com/openembedded/meta-openembedded"
+                    }
+                },
+                "branch": "master",
+                "rev": "master"
+            },
+            "path": "meta-openembedded"
+        },
+        "meta-freescale": {
+            "git-remote": {
+                "remotes": {
+                    "origin": {
+                        "uri": "https://github.com/Freescale/meta-freescale"
+                    }
+                },
+                "branch": "master",
+                "rev": "master"
+            },
+            "path": "meta-freescale"
+        },
+        "meta-freescale-3rdparty": {
+            "git-remote": {
+                "remotes": {
+                    "origin": {
+                        "uri": "https://github.com/Freescale/meta-freescale-3rdparty"
+                    }
+                },
+                "branch": "master",
+                "rev": "master"
+            },
+            "path": "meta-freescale-3rdparty"
+        },
+        "meta-freescale-distro": {
+            "git-remote": {
+                "remotes": {
+                    "origin": {
+                        "uri": "https://github.com/Freescale/meta-freescale-distro"
+                    }
+                },
+                "branch": "master",
+                "rev": "master"
+            },
+            "path": "meta-freescale-distro"
+        }
+    },
+    "bitbake-setup": {
+        "configurations": [
+        {
+            "bb-layers": [
+                "openembedded-core/meta",
+                "meta-yocto/meta-poky",
+                "meta-freescale",
+                "meta-freescale-3rdparty",
+                "meta-freescale-distro"
+            ],
+            "setup-dir-name": "$distro-$machine-master",
+            "oe-fragments-one-of": {
+                "machine": {
+                    "description": "Target machines",
+                    "options": [
+                        {"name": "machine/imx23evk",                "description": "NXP i.MX23 Evaluation Kit"},
+                        {"name": "machine/imx28evk",                "description": "NXP i.MX28 Evaluation Kit"},
+                        {"name": "machine/imx51evk",                "description": "NXP i.MX51 Evaluation Kit"},
+                        {"name": "machine/imx53qsb",                "description": "NXP i.MX53 Quick Start Board"},
+                        {"name": "machine/imx6qdlsabreauto",        "description": "NXP i.MX6QP/Q/DL SABRE Automotive"},
+                        {"name": "machine/imx6qdlsabresd",          "description": "NXP i.MX6QP/Q/DL SABRE Smart Device"},
+                        {"name": "machine/imx6slevk",               "description": "NXP i.MX6SL Evaluation Kit"},
+                        {"name": "machine/imx6sllevk",              "description": "NXP i.MX6SLL EVK"},
+                        {"name": "machine/imx6sxsabreauto",         "description": "NXP i.MX6SoloX Sabre Automotive"},
+                        {"name": "machine/imx6sxsabresd",           "description": "NXP i.MX6SoloX Sabre SD"},
+                        {"name": "machine/imx6ulevk",               "description": "NXP i.MX6UL EVK"},
+                        {"name": "machine/imx6ullevk",              "description": "NXP i.MX6ULL EVK"},
+                        {"name": "machine/imx6ulz-14x14-evk",       "description": "NXP i.MX6ULZ 14x14 EVK"},
+                        {"name": "machine/imx7dsabresd",            "description": "NXP i.MX7D SABRE Smart Device"},
+                        {"name": "machine/imx7ulpevk",              "description": "NXP i.MX7ULP EVK"},
+                        {"name": "machine/imx8dx-mek",              "description": "i.MX 8DualX Multisensory Enablement Kit"},
+                        {"name": "machine/imx8dxl-a1-ddr3l-evk",    "description": "NXP i.MX 8DualXLite A1 EVK with DDR3L"},
+                        {"name": "machine/imx8dxl-a1-lpddr4-evk",   "description": "NXP i.MX 8DualXLite A1 EVK with LPDDR4"},
+                        {"name": "machine/imx8dxl-b0-ddr3l-evk",    "description": "NXP i.MX 8DualXLite B0 EVK with DDR3L"},
+                        {"name": "machine/imx8dxl-b0-lpddr4-evk",   "description": "NXP i.MX 8DualXLite B0 EVK with LPDDR4"},
+                        {"name": "machine/imx8mm-ddr4-evk",         "description": "NXP i.MX 8M Mini EVK with DDR4"},
+                        {"name": "machine/imx8mm-lpddr4-evk",       "description": "NXP i.MX 8M Mini EVK with LPDDR4"},
+                        {"name": "machine/imx8mn-ddr4-evk",         "description": "NXP i.MX 8M Nano EVK with DDR4"},
+                        {"name": "machine/imx8mn-lpddr4-evk",       "description": "NXP i.MX 8M Nano EVK with LPDDR4"},
+                        {"name": "machine/imx8mnul-ddr3l-evk",      "description": "NXP i.MX 8M Nano UltraLite EVK with DDR3L"},
+                        {"name": "machine/imx8mp-ddr4-evk",         "description": "NXP i.MX 8M Plus EVK with DDR4"},
+                        {"name": "machine/imx8mp-lpddr4-evk",       "description": "NXP i.MX 8M Plus EVK with LPDDR4"},
+                        {"name": "machine/imx8mq-evk",              "description": "NXP i.MX 8M Quad Evaluation Kit"},
+                        {"name": "machine/imx8mq-lpddr4-wevk",      "description": "NXP i.MX 8M Quad LPDDR4 EVK with Wi-Fi"},
+                        {"name": "machine/imx8qm-mek",              "description": "i.MX 8QuadMax Multisensory Enablement Kit, rev B0"},
+                        {"name": "machine/imx8qxp-mek",             "description": "i.MX 8QuadXPlus Multisensory Enablement Kit"},
+                        {"name": "machine/imx8ulp-lpddr4-evk",      "description": "NXP i.MX 8ULP EVK with LPDDR4"},
+                        {"name": "machine/imx93-11x11-lpddr4x-evk", "description": "NXP i.MX 93 11x11 EVK with LPDDR4X"},
+                        {"name": "machine/imx93-14x14-lpddr4x-evk", "description": "NXP i.MX 93 14x14 EVK with LPDDR4X"},
+                        {"name": "machine/imx93-9x9-lpddr4-qsb",    "description": "NXP i.MX93 9x9 QSB with LPDDR4"},
+                        {"name": "machine/imx943-19x19-lpddr4-evk", "description": "NXP i.MX 943 19x19 EVK with LPDDR4"},
+                        {"name": "machine/imx95-19x19-verdin",      "description": "Toradex i.MX 95 19x19 Verdin Evaluation Kit"},
+                        {"name": "machine/ls1012afrwy",             "description": "NXP QorIQ LS1012AFRWY"},
+                        {"name": "machine/ls1012ardb",              "description": "NXP QorIQ LS1012ARDB"},
+                        {"name": "machine/ls1028ardb",              "description": "NXP LS1028ARDB (64-bit)"},
+                        {"name": "machine/ls1043ardb",              "description": "NXP QorIQ LS1043ARDB"},
+                        {"name": "machine/ls1046afrwy",             "description": "NXP LS1046A (64-bit)"},
+                        {"name": "machine/ls1046ardb",              "description": "NXP LS1046ARDB (64-bit)"},
+                        {"name": "machine/ls1088ardb",              "description": "NXP LS1088ARDB (64-bit)"},
+                        {"name": "machine/ls1088ardb-pb",           "description": "NXP LS1088ARDB-PB (64-bit)"},
+                        {"name": "machine/ls2088ardb",              "description": "NXP LS2088ARDB (64-bit)"},
+                        {"name": "machine/lx2160ardb",              "description": "NXP LX2160ARDB (64-bit)"},
+                        {"name": "machine/lx2162aqds",              "description": "NXP LX2162AQDS (64-bit)"},
+                        {"name": "machine/mpc8548cds",              "description": "NXP MPC8548CDS"},
+                        {"name": "machine/p1020rdb",                "description": "NXP QorIQ P1020 Reference"},
+                        {"name": "machine/p2020rdb",                "description": "NXP QorIQ P2020 Reference"},
+                        {"name": "machine/p2041rdb",                "description": "NXP QorIQ P2041 Reference"},
+                        {"name": "machine/p3041ds",                 "description": "NXP QorIQ P3041 Development"},
+                        {"name": "machine/p4080ds",                 "description": "NXP QorIQ P4080 Development"},
+                        {"name": "machine/p5040ds",                 "description": "NXP QorIQ P5040 Development"},
+                        {"name": "machine/p5040ds-64b",             "description": "NXP QorIQ P5040 Development (64-bit)"},
+                        {"name": "machine/t1024rdb",                "description": "NXP QorIQ T1024 Reference"},
+                        {"name": "machine/t1024rdb-64b",            "description": "NXP QorIQ T1024 Reference (64-bit)"},
+                        {"name": "machine/t1042d4rdb",              "description": "NXP QorIQ T1042D4 Reference"},
+                        {"name": "machine/t1042d4rdb-64b",          "description": "NXP QorIQ T1042D4 Reference (64-bit)"},
+                        {"name": "machine/t2080rdb",                "description": "NXP QorIQ T2080 Reference"},
+                        {"name": "machine/t2080rdb-64b",            "description": "NXP QorIQ T2080 Reference (64-bit)"},
+                        {"name": "machine/t4240rdb",                "description": "NXP QorIQ T4240 Reference"},
+                        {"name": "machine/t4240rdb-64b",            "description": "NXP QorIQ T4240 Reference (64-bit)"}
+                    ]
+                },
+                "distro": {
+                    "description": "Target Distributions",
+                    "options": [
+                        {"name": "distro/fsl",  "description": "FSL NXP BSP base distribution"},
+                        {"name": "distro/fslc", "description": "FSLC Community BSP base distribution"}
+                    ]
+                }
+            },
+            "configurations": [
+            {
+                "name": "fsl",
+                "description": "I will use the distro base configuration only (either FSL or FSLC)"
+            },
+            {
+                "name": "accept-fsl-eula",
+                "description": "Accept NXP EULA only",
+                "oe-fragments": [
+                    "freescale-layer/accept-fsl-eula"
+                ]
+            },
+            {
+                "name": "fsl-framebuffer",
+                "description": "Accept NXP EULA and configure FrameBuffer backend",
+                "oe-fragments": [
+                    "freescale-layer/eula/accept-fsl-eula",
+                    "freescale-layer/graphics/framebuffer"
+                ]
+            },
+            {
+                "name": "fsl-wayland",
+                "description": "Accept NXP EULA and configure Wayland with systemd",
+                "oe-fragments": [
+                    "freescale-layer/eula/accept-fsl-eula",
+                    "freescale-layer/init/systemd",
+                    "freescale-layer/graphics/wayland"
+                ]
+            },
+            {
+                "name": "fsl-xwayland",
+                "description": "Accept NXP EULA and configure XWayland with systemd",
+                "oe-fragments": [
+                    "freescale-layer/eula/accept-fsl-eula",
+                    "freescale-layer/init/systemd",
+                    "freescale-layer/graphics/xwayland"
+                ]
+            },
+            {
+                "name": "framebuffer",
+                "description": "Configure FrameBuffer backend",
+                "oe-fragments": [
+                    "freescale-layer/graphics/framebuffer"
+                ]
+            },
+            {
+                "name": "wayland",
+                "description": "Configure Wayland with systemd",
+                "oe-fragments": [
+                    "freescale-layer/init/systemd",
+                    "freescale-layer/graphics/wayland"
+                ]
+            },
+            {
+                "name": "xwayland",
+                "description": "Configure XWayland with systemd",
+                "oe-fragments": [
+                    "freescale-layer/init/systemd",
+                    "freescale-layer/graphics/xwayland"
+                ]
+            }
+            ]
+        }
+        ]
+    },
+    "version": "1.0"
+}
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
index 0fce6af1a..7c5303066 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
@@ -3,13 +3,19 @@ DEPENDS = "gcc-arm-none-eabi-native"
 
 inherit deploy
 
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains('UBOOT_CONFIG', 'sd-ecc', 'ecc', '', d)}"
+
+PACKAGECONFIG[ecc] = ""
+PACKAGECONFIG[tcm] = ""
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-OEI_CONFIGS ?= "UNDEFINED"
+OEI_CONFIGS ?= "ddr ${@bb.utils.filter('PACKAGECONFIG', 'tcm', d)}"
 OEI_CORE    ?= "UNDEFINED"
 OEI_SOC     ?= "UNDEFINED"
 OEI_BOARD   ?= "UNDEFINED"
-OEI_DDRCONFIG  ?= ""
+OEI_DDR_CONFIG  ?= ""
 OEI_DEBUG   ?= "0"
 
 LDFLAGS[unexport] = "1"
@@ -20,7 +26,15 @@ EXTRA_OEMAKE = "\
     OEI_CROSS_COMPILE=arm-none-eabi-"
 
 EXTRA_OEMAKE:append:mx95-generic-bsp = " r=${IMX_SOC_REV}"
-EXTRA_OEMAKE:append = " ${@' DDR_CONFIG=${OEI_DDRCONFIG}' if d.getVar('OEI_DDRCONFIG') else ''}"
+
+python () {
+    if 'ecc' in d.getVar('PACKAGECONFIG'):
+        ddr_conf = d.getVar('OEI_DDR_CONFIG_ECC')
+    else:
+        ddr_conf = d.getVar('OEI_DDR_CONFIG')
+    if ddr_conf:
+        d.appendVar('EXTRA_OEMAKE', ' DDR_CONFIG='+ddr_conf)
+}
 
 do_configure() {
     for oei_config in ${OEI_CONFIGS}; do
@@ -51,4 +65,4 @@ SYSROOT_DIRS += "/firmware"
 
 PROVIDES += "virtual/imx-oei"
 
-COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
+COMPATIBLE_MACHINE = "(mx95-generic-bsp|mx943-generic-bsp)"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
index 29a58ed08..227d76b2c 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
@@ -12,6 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b66f32a90f9577a5a3255c21d79bc619"
 SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}"
 IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
 SRCBRANCH = "master"
-SRCREV = "ca91ce798b2f3a2a0bab8c0f835f4bea88c9b080"
+SRCREV = "49bfaa93e9d1fe213866bcb9507927a59a9ede5a"
 
 require imx-oei.inc
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
index 1d23a22cd..65f0a0e0c 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -1,6 +1,7 @@
 # Set generic compiler for system manager core
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "${SM_COMPILER}"
+DEPENDS:append:mx943-nxp-bsp = " srecord-native"
 SM_COMPILER ?= "gcc-arm-none-eabi-native"
 PROVIDES += "virtual/imx-system-manager"
 
@@ -18,18 +19,15 @@ SYSTEM_MANAGER_CONFIG ?= "INVALID"
 LDFLAGS[unexport] = "1"
 
 EXTRA_OEMAKE = " \
-    V=1 \
+    CONFIG=${SYSTEM_MANAGER_CONFIG} \
     SM_CROSS_COMPILE=arm-none-eabi- \
+    V=1 \
     ${PACKAGECONFIG_CONFARGS} \
 "
 
 do_configure() {
-    oe_runmake config=${SYSTEM_MANAGER_CONFIG} clean
-    oe_runmake config=${SYSTEM_MANAGER_CONFIG} cfg
-}
-
-do_compile() {
-    oe_runmake config=${SYSTEM_MANAGER_CONFIG}
+    oe_runmake clean
+    oe_runmake cfg
 }
 
 do_install[noexec] = "1"
@@ -41,4 +39,4 @@ do_deploy() {
         ${DEPLOYDIR}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}.bin
 }
 
-COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
+COMPATIBLE_MACHINE = "(mx95-generic-bsp|mx943-generic-bsp)"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2025q4.bb
index 55826b016..81233bbff 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2025q4.bb
@@ -9,12 +9,12 @@ enters a service mode where it provides access to clocking, power, sensor, \
 and pin control via a client RPC API based on ARM's System Control and \
 Management Interface (SCMI)."
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b66f32a90f9577a5a3255c21d79bc619"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f2a70813bc08547f509361c08b718861"
 
 SRC_URI = "${IMX_SYSTEM_MANAGER_SRC};branch=${SRCBRANCH}"
 IMX_SYSTEM_MANAGER_SRC ?= "git://github.com/nxp-imx/imx-sm.git;protocol=https"
 SRCBRANCH = "master"
-SRCREV = "709deccd9338399eb39b5cf99a60eab4fa60d539"
+SRCREV = "de30901b287e5c9a1e467d2d9a497b97bb6f7939"
 
 require imx-system-manager.inc
 
diff --git a/recipes-bsp/atf/qoriq-atf-2.12.inc b/recipes-bsp/atf/qoriq-atf-2.12.inc
index a025401e0..26d79b4a1 100644
--- a/recipes-bsp/atf/qoriq-atf-2.12.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.12.inc
@@ -6,4 +6,4 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 ATF_BRANCH ?= "lf_v2.12"
 ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https"
 SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}"
-SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
+SRCREV = "a266ff458c2526a6474036a5c6648be6fdc54fe3"
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 943d8a680..d0607a093 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -1,4 +1,4 @@
-# Copyright 2020-2025 NXP
+# Copyright 2020-2026 NXP
 
 SUMMARY = "Wi-Fi firmware redistributed by NXP"
 DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
@@ -7,42 +7,25 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
+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.20_2.0.0"
-SRCREV = "d31ea8aaba67e188ba0071a90da0364e3946c83a"
+SRCBRANCH = "lf-6.12.49_2.2.0"
+SRCREV = "8c9b278016c97527b285f2fcbe53c2d428eb171d"
 
 
 inherit allarch
 
 CLEANBROKEN = "1"
 ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY:${PN}-all-sdio = "1"
 ALLOW_EMPTY:${PN}-all-pcie = "1"
+ALLOW_EMPTY:${PN}-all-sdio = "1"
+ALLOW_EMPTY:${PN}-all-usb = "1"
 
-do_compile() {
-        :
-}
+do_compile[noexec] = "1"
 
 do_install() {
-
     install -d ${D}${nonarch_base_libdir}/firmware/nxp
-    install -d ${D}${nonarch_base_libdir}/firmware/brcm/
-
-    # Install bcm4359-pcie
-    for f in cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie*; do
-        [ -e $f ] && install -D -m 0644 $f ${D}${nonarch_base_libdir}/firmware/brcm/$(basename $f)
-    done
-
-    for f in cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd; do
-        [ -e $f ] && install -D -m 0644 $f ${D}${sysconfdir}/firmware/$(basename $f)
-    done
-
-    for f in nxp/FwImage_IW612_SD/*; do
-        [ -e $f ] && install -D -m 0644 $f ${D}${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/$(basename $f)
-    done
-
     oe_runmake install INSTALLDIR=${D}${nonarch_base_libdir}/firmware/nxp
 
     # Upstream SDIO8997 and IW416 driver firmwares are located on mrvl folder
@@ -58,15 +41,17 @@ do_install() {
 }
 
 PACKAGES =+ " \
-    ${PN}-bcm4359-pcie \
+    ${PN}-all-pcie \
+    ${PN}-all-sdio \
+    ${PN}-all-usb \
+    \
     ${PN}-nxp-common \
-    ${PN}-nxp8801-sdio \
     ${PN}-nxp8987-sdio \
     ${PN}-nxp8997-common \
     ${PN}-nxp8997-pcie \
     ${PN}-nxp8997-sdio \
-    ${PN}-nxp9098-pcie \
     ${PN}-nxp9098-common \
+    ${PN}-nxp9098-pcie \
     ${PN}-nxp9098-sdio \
     ${PN}-nxpaw693-pcie \
     ${PN}-nxpiw416-sdio \
@@ -75,9 +60,23 @@ PACKAGES =+ " \
     ${PN}-nxpiw612-sdio \
 "
 
-FILES:${PN}-bcm4359-pcie = " \
-    ${nonarch_base_libdir}/firmware/brcm/brcmfmac4359-pcie.* \
-    ${sysconfdir}/firmware/BCM4349B1_*.hcd \
+RDEPENDS:${PN}-all-sdio = " \
+    ${PN}-nxp8987-sdio \
+    ${PN}-nxp8997-sdio \
+    ${PN}-nxp9098-sdio \
+    ${PN}-nxpiw416-sdio \
+    ${PN}-nxpiw610-sdio \
+    ${PN}-nxpiw612-sdio \
+"
+
+RDEPENDS:${PN}-all-pcie = " \
+    ${PN}-nxp8997-pcie \
+    ${PN}-nxp9098-pcie \
+    ${PN}-nxpaw693-pcie \
+"
+
+RDEPENDS:${PN}-all-usb = " \
+    ${PN}-nxpiw610-usb \
 "
 
 FILES:${PN}-nxp-common = " \
@@ -85,11 +84,6 @@ FILES:${PN}-nxp-common = " \
     ${nonarch_base_libdir}/firmware/nxp/helper_uart_3000000.bin \
 "
 
-FILES:${PN}-nxp8801-sdio = " \
-    ${nonarch_base_libdir}/firmware/nxp/*8801* \
-"
-RDEPENDS:${PN}-nxp8801-sdio += "${PN}-nxp-common"
-
 FILES:${PN}-nxp8987-sdio = " \
     ${nonarch_base_libdir}/firmware/nxp/*8987* \
 "
@@ -151,6 +145,12 @@ RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RREPLACES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RCONFLICTS:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 
+FILES:${PN}-nxpaw693-pcie += " \
+    ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
+    ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
+"
+RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
+
 FILES:${PN}-nxpiw416-sdio = " \
     ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \
     ${nonarch_base_libdir}/firmware/nxp/*iw416* \
@@ -188,28 +188,3 @@ 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"
-
-FILES:${PN}-nxpaw693-pcie += " \
-    ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
-    ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
-"
-RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
-
-RDEPENDS:${PN}-all-sdio = " \
-    ${PN}-nxp8801-sdio \
-    ${PN}-nxp8987-sdio \
-    ${PN}-nxp9098-sdio \
-    ${PN}-nxpiw416-sdio \
-    ${PN}-nxpiw610-sdio \
-    ${PN}-nxpiw612-sdio \
-"
-
-RDEPENDS:${PN}-all-pcie = " \
-    ${PN}-nxp8997-pcie \
-    ${PN}-nxp9098-pcie \
-    ${PN}-nxpaw693-pcie \
-"
-
-RDEPENDS:${PN}-all-usb = " \
-    ${PN}-nxpiw610-usb \
-"
diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb
index 4f0ed79a1..9c00a05b1 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_git.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb
@@ -11,7 +11,7 @@ PV = "5.5+git${SRCPV}"
 SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \
            file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \
 "
-SRCREV = "ff13a99a22aa73cca0e09a33c2ebb6a94ad698da"
+SRCREV = "c155f9e9d2e0008937c37d6e6f79e8436c099afa"
 
 inherit autotools pkgconfig
 
diff --git a/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch b/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch
deleted file mode 100644
index 964658fce..000000000
--- a/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 24e317b5cdc2b78735dfa7d4b2776b587b7a193f Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Thu, 12 Jun 2025 13:15:28 -0500
-Subject: [PATCH] Fix gcc 15 errors
-
-Fixes HDMI and IPU headers c23 violations:
-```
-In file included from mxc_hdmi-cec.c:40:
-hdmi-cec.h:54:23: error: 'bool' cannot be defined via 'typedef'
-   54 | typedef unsigned char bool;
-      |                       ^~~~
-hdmi-cec.h:54:23: note: 'bool' is a keyword with '-std=c23' onwards
-hdmi-cec.h:54:1: warning: useless type name in empty declaration
-   54 | typedef unsigned char bool;
-      | ^~~~~~~
-```
-
-Upstream-Status: Submitted
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
----
- hdmi-cec/hdmi-cec.h | 2 --
- ipu/ipu.h           | 3 ---
- 2 files changed, 5 deletions(-)
-
-diff --git a/hdmi-cec/hdmi-cec.h b/hdmi-cec/hdmi-cec.h
-index 7d466c5..2b66208 100644
---- a/hdmi-cec/hdmi-cec.h
-+++ b/hdmi-cec/hdmi-cec.h
-@@ -51,8 +51,6 @@
- #define false  0
- #endif
- 
--typedef unsigned char bool;
--
- /*!
-  * Enumeration of device type.
-  */
-diff --git a/ipu/ipu.h b/ipu/ipu.h
-index 278385c..1a55875 100644
---- a/ipu/ipu.h
-+++ b/ipu/ipu.h
-@@ -30,9 +30,6 @@
- #ifdef __KERNEL__
- #include <linux/interrupt.h>
- #else
--#ifndef __cplusplus
--typedef unsigned char bool;
--#endif
- #define irqreturn_t int
- #define dma_addr_t int
- #define u32 unsigned int
--- 
-2.34.1
-
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 5cf1b5744..0aa74250f 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -12,10 +12,9 @@ PE = "1"
 
 PV = "5.9+${SRCPV}"
 
-SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH} \
-           file://0001-Fix-gcc-15-errors.patch"
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
+SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "6cad1ba39d16247088f6a45dc07bbbf2cf96a332"
 
 inherit use-imx-headers
 
@@ -30,6 +29,8 @@ PLATFORM:mx7d-nxp-bsp   = "IMX7"
 PLATFORM:mx7ulp-nxp-bsp = "IMX7"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
 PLATFORM:mx9-nxp-bsp    = "IMX8ULP"
+PLATFORM:mx93-nxp-bsp   = "IMX8ULP"
+PLATFORM:mx943-nxp-bsp  = "IMX8ULP"
 
 PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE = ""
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 6b027eb75..120f0594e 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -63,6 +63,7 @@ BOOT_STAGING:mx8m-generic-bsp  = "${S}/iMX8M"
 BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX"
 BOOT_STAGING:mx91-generic-bsp  = "${S}/iMX91"
 BOOT_STAGING:mx93-generic-bsp  = "${S}/iMX93"
+BOOT_STAGING:mx943-generic-bsp = "${S}/iMX94"
 BOOT_STAGING:mx95-generic-bsp  = "${S}/iMX95"
 
 SOC_FAMILY                    = "INVALID"
@@ -72,11 +73,17 @@ SOC_FAMILY:mx8x-generic-bsp   = "mx8x"
 SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
 SOC_FAMILY:mx91-generic-bsp   = "mx91"
 SOC_FAMILY:mx93-generic-bsp   = "mx93"
+SOC_FAMILY:mx943-generic-bsp  = "mx943"
 SOC_FAMILY:mx95-generic-bsp   = "mx95"
 
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 
 MKIMAGE_EXTRA_ARGS ?= ""
+MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= " \
+    OEI=${OEI_ENABLE} \
+    LPDDR_TYPE=${DDR_TYPE} \
+    MSEL=${MSEL_TYPE} \
+"
 MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
     OEI=${OEI_ENABLE} \
     LPDDR_TYPE=${DDR_TYPE} \
@@ -177,6 +184,14 @@ compile_mx93() {
     fi
 }
 
+compile_mx943() {
+    bbnote i.MX 943 boot binary build
+    compile_mx93
+
+    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
+       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
+}
+
 compile_mx95() {
     bbnote i.MX 95 boot binary build
     compile_mx93
@@ -348,6 +363,12 @@ deploy_mx93() {
     fi
 }
 
+deploy_mx943() {
+    deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
+                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
+}
+
 deploy_mx95() {
     deploy_mx93
     install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave-prime_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-prime_git.bb
new file mode 100644
index 000000000..1bd72d118
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-prime_git.bb
@@ -0,0 +1,13 @@
+require imx-secure-enclave.inc
+
+SUMMARY += "PRIME"
+DESCRIPTION += "PRIME"
+
+PLAT = "prime"
+
+do_install:append() {
+    # Remove common content that is to be installed by imx-secure-enclave
+    rm ${D}${datadir}/se/README
+}
+
+COMPATIBLE_MACHINE = "(mx943-nxp-bsp|mx952-nxp-bsp)"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave-seco_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-seco_git.bb
new file mode 100644
index 000000000..803cbeffe
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-seco_git.bb
@@ -0,0 +1,20 @@
+require imx-secure-enclave.inc
+
+SUMMARY += "SECO"
+DESCRIPTION += "SECO"
+
+PLAT = "seco"
+
+EXTRA_OEMAKE:append:mx8x-nxp-bsp = " COMPATIBLE_MACHINE=mx8dxl-nxp-bsp"
+
+do_install:append:mx9-nxp-bsp() {
+    # Remove common content that is to be installed by imx-secure-enclave
+    for i in common hsm nvm.h; do
+        rm -rf ${D}${includedir}/$i
+    done
+    rm ${D}${datadir}/se/README
+    rm ${D}${bindir}/nvmd_conf_setup.sh
+    rm ${D}${bindir}/se_tools
+}
+
+COMPATIBLE_MACHINE = "(mx8x-nxp-bsp|mx943-nxp-bsp|mx95-nxp-bsp|mx952-nxp-bsp)"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
new file mode 100644
index 000000000..bb045b6fb
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
@@ -0,0 +1,29 @@
+# Copyright 2021-2025 NXP
+
+SUMMARY = "NXP i.MX SECURE ENCLAVE library"
+DESCRIPTION = "NXP IMX SECURE ENCLAVE library"
+SECTION = "base"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
+
+DEPENDS = " mbedtls openssl"
+
+SRC_URI = "${SECURE_ENCLAVE_LIB_SRC};branch=${SRCBRANCH}"
+SECURE_ENCLAVE_LIB_SRC ?= "git://github.com/NXP/imx-secure-enclave.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "24fdfb728fff1644878f5ab4a5557decf0769959"
+
+PLAT ?= "UNDEFINED"
+
+EXTRA_OEMAKE = "PLAT=${PLAT} OPENSSL_PATH=${STAGING_INCDIR} MBEDTLS_PATH=${STAGING_DIR_HOST}${datadir}/mbedtls-source"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_install() {
+        oe_runmake -C ${S} DESTDIR=${D} install_tests
+}
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+FILES:${PN} += "${datadir}/se"
+RDEPENDS:${PN}:append = " bash"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
index 525824f79..647a9d768 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -1,29 +1,18 @@
-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"
+require imx-secure-enclave.inc
 
 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"
+SYSTEMD_AUTO_ENABLE = "disable"
+SYSTEMD_SERVICE:${PN} = "nvm_daemon.service"
 
-EXTRA_OEMAKE += "PLAT=ele"
+PLAT = "ele"
 
-TARGET_CC_ARCH += "${LDFLAGS}"
+PACKAGES =+ "${PN}-crrm"
 
-do_install () {
-    oe_runmake DESTDIR=${D} install
-    rm -rf ${D}/usr/share
-}
+RDEPENDS:${PN} = "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${PN}-crrm', '', d)}"
 
-SYSTEMD_AUTO_ENABLE = "disable"
-SYSTEMD_SERVICE:${PN} = "nvm_daemon.service"
+FILES:${PN}-crrm = " \
+    ${bindir}/ele_crrm_test \
+    ${libdir}/lib*crrm${SOLIBS}"
 
 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 3dd6153a0..c5dc6ef50 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright (C) 2017-2022 NXP
+# Copyright (C) 2017-2022,2026 NXP
 
 SUMMARY = "Test programs for i.MX BSP"
 DESCRIPTION = "Unit tests for the i.MX BSP"
@@ -19,10 +19,12 @@ DEPENDS:append:mx943-nxp-bsp  = " imx-lib"
 PE = "1"
 PV = "7.0+${SRCPV}"
 
-SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "${IMXTEST_SRC};branch=${SRCBRANCH} \
            file://memtool_profile"
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "38f9cf1f08bb6fcdd6aaf9191e0b53f02e02537b"
+
+IMXTEST_SRC ?= "git://github.com/nxp-imx/imx-test.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "e5dad74f8defd6108cac5ba21bf4ff268445d3ff"
 
 inherit module-base use-imx-headers
 
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index 54997ae37..ecd33f59f 100644
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -10,7 +10,7 @@ PR = "r1"
 PV = "0.5.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-uuc.git;protocol=https;branch=master"
-SRCREV = "25f65e10368aa07056f9536e88ed911ac7f38f99"
+SRCREV = "798d6ed8cf0971aec19c5f6c7c058450817fa378"
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 6a52861b0..f7e309ae7 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 = "45e69253690452656a4dfe933c4c9f55e1eb0f5f"
+SRCREV = "82fa0c6d03b00dc84b6a64ba91f42c35762dd903"
 
 export PYTHON = "${USRBINPATH}/python3"
 
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc
index 9640ba1de..b80bf61d7 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a
 
 SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
 UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
-SRCBRANCH = "lf_v2024.04"
+SRCBRANCH = "lf_v2025.04"
 LOCALVERSION ?= "-${SRCBRANCH}"
-SRCREV = "e3219a5a73445219df605d1492687918d488055c"
+SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692"
 
 DEPENDS += " \
     bc-native \
diff --git a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
index 27c3555f4..27c3555f4 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
index be8433e47..11e5ea0ff 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -19,7 +19,7 @@ PV:append = "+${SRCPV}"
 UBOOT_BRANCH ?= "lf_v2025.04"
 UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https"
 SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}"
-SRCREV = "9383f8387dc76524524da69992db96c22195a57c"
+SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692"
 
 B = "${UNPACKDIR}/build"
 PV:append = "+fslgit"
diff --git a/recipes-connectivity/mbedtls/mbedtls/run-ptest b/recipes-connectivity/mbedtls/mbedtls/run-ptest
new file mode 100644
index 000000000..059ab4ecb
--- /dev/null
+++ b/recipes-connectivity/mbedtls/mbedtls/run-ptest
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd "$ptestdir"/tests || exit
+
+tests=$(find * -type f -name 'test_suite_*')
+
+for f in $tests
+do
+    if test -x ./"$f"; then
+        if ./"$f" > ./"$f".out 2> ./"$f".err; then
+            echo "PASS: $f"
+        else
+            echo "FAIL: $f"
+        fi
+    fi
+done
diff --git a/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
new file mode 100644
index 000000000..e6dfe4309
--- /dev/null
+++ b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
@@ -0,0 +1,78 @@
+SUMMARY = "Lightweight crypto and SSL/TLS library"
+DESCRIPTION = "mbedtls is a lean open source crypto library          \
+for providing SSL and TLS support in your programs. It offers        \
+an intuitive API and documented header files, so you can actually    \
+understand what the code does. It features:                          \
+                                                                     \
+ - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4,  \
+   Camellia and XTEA                                                 \
+ - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5            \
+ - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG   \
+ - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \
+   ECDSA and ECDH                                                    \
+ - SSL v3 and TLS 1.0, 1.1 and 1.2                                   \
+ - Abstraction layers for ciphers, hashes, public key operations,    \
+   platform abstraction and threading                                \
+"
+
+HOMEPAGE = "https://tls.mbed.org/"
+
+LICENSE = "Apache-2.0 | GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
+
+SECTION = "libs"
+
+SRC_URI = "gitsm://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-3.6;tag=v${PV} \
+           file://run-ptest \
+           "
+
+SRCREV = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
+
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
+
+inherit cmake update-alternatives ptest
+
+PACKAGECONFIG ??= "shared-libs programs ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF"
+PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF"
+PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF"
+# Make X.509 and TLS calls use PSA
+# https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md
+PACKAGECONFIG[psa] = ""
+PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF"
+
+# For now the only way to enable PSA is to explicitly pass a -D via CFLAGS
+CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}"
+
+PROVIDES += "polarssl"
+RPROVIDES:${PN} = "polarssl"
+
+PACKAGES =+ "${PN}-programs"
+FILES:${PN}-programs = "${bindir}/"
+
+ALTERNATIVE:${PN}-programs = "${@bb.utils.contains('PACKAGECONFIG', 'programs', 'hello', '', d)}"
+ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello"
+
+BBCLASSEXTEND = "native nativesdk"
+
+CVE_PRODUCT = "mbed_tls"
+
+# Strip host paths from autogenerated test files
+do_compile:append() {
+        sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || :
+        sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || :
+}
+
+# Export source files/headers needed by Arm Trusted Firmware
+sysroot_stage_all:append() {
+        sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"
+        sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include"
+}
+
+do_install_ptest () {
+        install -d ${D}${PTEST_PATH}/tests
+        install -d ${D}${PTEST_PATH}/framework
+        cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/
+        find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete
+        cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/
+}
diff --git a/recipes-devtools/qemu/qemu.inc b/recipes-devtools/qemu/qemu-qoriq.inc
index 60686bde8..60686bde8 100644
--- a/recipes-devtools/qemu/qemu.inc
+++ b/recipes-devtools/qemu/qemu-qoriq.inc
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
index cb415d66b..8996a2f44 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -1,6 +1,6 @@
 BBCLASSEXTEND = ""
 
-require qemu.inc
+require qemu-qoriq.inc
 
 COMPATIBLE_MACHINE = "(qoriq)"
 
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index 596625ece..7a90bc996 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
 
 SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1"
-SRCREV = "8f73f2600111440d034227966d6ff03ec47d8f1a"
+SRCREV = "df31aaa46b77e3918f893ca08b1e63871ae880b6"
 
 inherit bash-completion
 
diff --git a/recipes-extended/dpdk/dpdk-20.11.inc b/recipes-extended/dpdk/dpdk-20.11.inc
deleted file mode 100644
index 66bcda2ff..000000000
--- a/recipes-extended/dpdk/dpdk-20.11.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Data Plane Development Kit"
-HOMEPAGE = "http://dpdk.org"
-LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
-                    file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
-
-SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1"
-SRCREV = "f74b8bd5ab1c6ff76e956fc202a56aea2d200270"
-
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
-
-CVE_PRODUCT = "data_plane_development_kit"
diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-Makefile-add-makefile.patch b/recipes-extended/dpdk/dpdk-20.11/0001-Makefile-add-makefile.patch
deleted file mode 100644
index 18b75fb65..000000000
--- a/recipes-extended/dpdk/dpdk-20.11/0001-Makefile-add-makefile.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 768cef60957d5e840071d1d6514d4add3f3c2904 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 14 Apr 2021 17:25:53 +0800
-Subject: [PATCH] Makefile: add makefile
-
-Current meson build for kernel module build does not fit in Yocto.
-So added Makefile to build rte_kni.ko
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- kernel/linux/kni/Kbuild   |  6 ------
- kernel/linux/kni/Makefile | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 35 insertions(+), 6 deletions(-)
- delete mode 100644 kernel/linux/kni/Kbuild
- create mode 100644 kernel/linux/kni/Makefile
-
-diff --git a/kernel/linux/kni/Kbuild b/kernel/linux/kni/Kbuild
-deleted file mode 100644
-index e5452d6c00..0000000000
---- a/kernel/linux/kni/Kbuild
-+++ /dev/null
-@@ -1,6 +0,0 @@
--# SPDX-License-Identifier: BSD-3-Clause
--# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
--
--ccflags-y := $(MODULE_CFLAGS)
--obj-m := rte_kni.o
--rte_kni-y := $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/*.c))
-diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
-new file mode 100644
-index 0000000000..19897ee06e
---- /dev/null
-+++ b/kernel/linux/kni/Makefile
-@@ -0,0 +1,35 @@
-+#
-+# Makefile for building rte_kni.ko
-+#
-+MODULE_CFLAGS += -include $(S)/config/rte_config.h
-+MODULE_CFLAGS += -I$(S)/lib/librte_eal/include
-+MODULE_CFLAGS += -I$(S)/lib/librte_kni
-+MODULE_CFLAGS += -I$(S)/kernel/linux/kni
-+MODULE_CFLAGS += -I$(S)
-+MODULE_CFLAGS += -I$(STAGING_INCDIR)
-+
-+rte_kni-objs = kni_misc.o kni_net.o
-+
-+ccflags-y := $(MODULE_CFLAGS)
-+cflags-y := $(MODULE_CFLAGS)
-+obj-m := rte_kni.o
-+
-+
-+KERNEL_MAKE_OPTS := -C $(STAGING_KERNEL_DIR) M=$(CURDIR)
-+ifneq ($(ARCH),)
-+KERNEL_MAKE_OPTS += ARCH=$(ARCH)
-+endif
-+ifneq ($(CROSS_COMPILE),)
-+KERNEL_MAKE_OPTS += CROSS_COMPILE=$(CROSS_COMPILE)
-+endif
-+
-+build:
-+       $(MAKE) $(KERNEL_MAKE_OPTS) modules
-+
-+install: modules_install
-+
-+modules_install:
-+       $(MAKE) $(KERNEL_MAKE_OPTS) modules_install
-+
-+clean:
-+       $(MAKE) $(KERNEL_MAKE_OPTS) clean
--- 
-2.17.1
-
diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch b/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch
deleted file mode 100644
index f88b64843..000000000
--- a/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6fe85f3a12d15e25345ef0547035a929351a179c Mon Sep 17 00:00:00 2001
-From: Ting Liu <ting.liu@nxp.com>
-Date: Fri, 17 Sep 2021 12:53:53 +0530
-Subject: [PATCH] drivers/net/enetfec/enet_uio.c: fix multiple definition
-
-.../drivers/net/enetfec/enet_uio.c:22: multiple definition of `count';
-.../examples/flow_classify/flow_classify.c:170: first defined here
-collect2: error: ld returned 1 exit status
-
-Upstream-Status: Pending
-Signed-off-by: Ting Liu <ting.liu@nxp.com>
----
- drivers/net/enetfec/enet_uio.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/enetfec/enet_uio.c b/drivers/net/enetfec/enet_uio.c
-index b64dc522e8..9e09f9beb6 100644
---- a/drivers/net/enetfec/enet_uio.c
-+++ b/drivers/net/enetfec/enet_uio.c
-@@ -19,7 +19,7 @@
- #include "enet_uio.h"
- 
- static struct uio_job enetfec_uio_job;
--int count;
-+static int count;
- 
- /** @brief Reads first line from a file.
-  * Composes file name as: root/subdir/filename
--- 
-2.25.1
-
diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch b/recipes-extended/dpdk/dpdk-20.11/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch
deleted file mode 100644
index 4df28c40b..000000000
--- a/recipes-extended/dpdk/dpdk-20.11/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 308409d72671b7978b20d40748ad985a235b6c86 Mon Sep 17 00:00:00 2001
-From: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com>
-Date: Thu, 24 Jun 2021 11:30:09 +0800
-Subject: [PATCH] ifpga/meson: Fix finding librt using find_library()
-
-Finding with "librt" keyword would give the output
-with full path of librt such as /usr/lib/librt.so
-instead of -lrt.
-
-Assume find_library() will prepend "lib", thus remove
-"lib" from "librt" keyword. The output will shows as
--lrt.
-
-Upstream-Status: Submitted [https://mails.dpdk.org/archives/stable/2021-June/031840.html]
-
-Signed-off-by: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com>
----
- drivers/raw/ifpga/base/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
-index da2d6e33c..949f7f127 100644
---- a/drivers/raw/ifpga/base/meson.build
-+++ b/drivers/raw/ifpga/base/meson.build
-@@ -25,7 +25,7 @@ sources = [
-
- rtdep = dependency('librt', required: false)
- if not rtdep.found()
--       rtdep = cc.find_library('librt', required: false)
-+       rtdep = cc.find_library('rt', required: false)
- endif
- if not rtdep.found()
-        build = false
---
-2.32.0
diff --git a/recipes-extended/dpdk/dpdk-module_20.11.bb b/recipes-extended/dpdk/dpdk-module_20.11.bb
deleted file mode 100644
index 585e198ea..000000000
--- a/recipes-extended/dpdk/dpdk-module_20.11.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-include dpdk-20.11.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk-${PV}:"
-
-SRC_URI += " \
-            file://0001-Makefile-add-makefile.patch \
-"
-
-inherit module
-
-#kernel module needs 'rte_build_config.h', which is generated at buid time
-DEPENDS += "dpdk"
-
-export S
-export STAGING_KERNEL_DIR
-export STAGING_INCDIR
-export INSTALL_MOD_DIR = "dpdk"
-
-do_configure[noexec] = "1"
-
-do_compile() {
-    cd ${S}/kernel/linux/kni
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
-           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-           AR="${KERNEL_AR}" \
-               O=${STAGING_KERNEL_BUILDDIR} \
-           KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \
-           ${MAKE_TARGETS}
-}
-
-do_install() {
-    cd ${S}/kernel/linux/kni
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
-               INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \
-               CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-               O=${STAGING_KERNEL_BUILDDIR} \
-               ${MODULES_INSTALL_TARGET}
-}
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
deleted file mode 100644
index eabd18650..000000000
--- a/recipes-extended/dpdk/dpdk.inc
+++ /dev/null
@@ -1,120 +0,0 @@
-DESCRIPTION = "Data Plane Development Kit"
-HOMEPAGE = "http://dpdk.org"
-
-RDEPENDS:${PN} += "python3-core"
-DEPENDS = "virtual/kernel openssl"
-DEPENDS:append:x86-64 = " numactl"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
-
-inherit module
-
-COMPATIBLE_HOST = '(aarch64|arm|i.86|x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = 'null'
-COMPATIBLE_HOST:armv4 = 'null'
-COMPATIBLE_HOST:armv5 = 'null'
-COMPATIBLE_HOST:armv6 = 'null'
-
-COMPATIBLE_MACHINE = "(imx-nxp-bsp|qoriq)"
-
-DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc"
-DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc"
-DPDK_RTE_TARGET:armv7a = "${ARCH}-armv7a-linuxapp-gcc"
-DPDK_RTE_TARGET:armv7ve = "${ARCH}-armv7a-linuxapp-gcc"
-DPDK_RTE_TARGET ?= "${ARCH}-dpaa-linuxapp-gcc"
-
-export RTE_TARGET = "${DPDK_RTE_TARGET}"
-export RTE_OUTPUT = "${S}/${RTE_TARGET}"
-export  MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
-
-EXTRA_OEMAKE += 'ETHTOOL_LIB_PATH="${S}/examples/ethtool/lib/${RTE_TARGET}" RTE_SDK="${S}" \
-    OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \
-    RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" EXAMPLES_BUILD_DIR="${RTE_TARGET}" \
-'
-do_configure () {
-        #############################################################
-        ### default value for prefix is "usr", unsetting it, so it
-        ### will not be concatenated in ${RTE_TARGET}/Makefile
-        ### which will cause compilation failure
-        #############################################################
-        unset prefix
-        oe_runmake O=$RTE_TARGET T=$RTE_TARGET config
-}
-
-do_compile () {
-        unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
-
-        cd ${S}/${RTE_TARGET}
-        oe_runmake  CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_KNI_KMOD=y \
-                    CONFIG_RTE_LIBRTE_PMD_OPENSSL=y \
-                   EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" \
-                   EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
-                   CROSS="${TARGET_PREFIX}" \
-                   prefix=""  LDFLAGS="${TUNE_LDARGS}"  WERROR_FLAGS="-w" V=1
-
-        cd ${S}/examples/
-        for APP in l2fwd l3fwd cmdif l2fwd-qdma l2fwd-crypto ipsec-secgw vhost kni ip_fragmentation ip_reassembly; do
-            temp=`basename ${APP}`
-            if [ ${temp} = "ipsec-secgw" ] || [ ${temp} = "l2fwd-crypto" ]; then
-                oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
-                       EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
-                       CROSS="${TARGET_PREFIX}" -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y O="${S}/examples/${temp}"
-            else
-                oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
-                       EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
-                       CROSS="${TARGET_PREFIX}" -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y O="${S}/examples/${temp}/"
-            fi
-        done
-
-}
-
-do_install () {
-        oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D}
-        oe_runmake O=${RTE_OUTPUT} T= install-kmod DESTDIR=${D} kerneldir=${MODULE_DIR}
-        oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D}
-
-        # Install examples
-        install -d 0644 ${D}/${datadir}/dpdk/cmdif/include
-        install -d 0644 ${D}/${datadir}/dpdk/cmdif/lib
-        install -d 0644 ${D}/${datadir}/dpdk/examples
-        cp examples/cmdif/lib/client/fsl_cmdif_client.h examples/cmdif/lib/server/fsl_cmdif_server.h \
-            examples/cmdif/lib/shbp/fsl_shbp.h      ${D}/${datadir}/dpdk/cmdif/include
-        cp examples/cmdif/lib/${RTE_TARGET}/librte_cmdif.a ${D}/${datadir}/dpdk/cmdif/lib
-        install -d 0644 ${D}/${datadir}/dpdk/examples/ipsec_secgw
-        cp -r ${S}/examples/ipsec-secgw/*.cfg  ${D}/${datadir}/dpdk/examples/ipsec_secgw
-        cp -rf ${S}/nxp/* ${D}/${datadir}/dpdk
-        cp -r ${S}/examples/cmdif/cmdif_demo/${DPDK_RTE_TARGET}/cmdif_demo ${D}/${datadir}/dpdk/examples
-        cp -r ${S}/examples/vhost/vhost-switch ${D}/${datadir}/dpdk/examples
-        for APP in l2fwd l3fwd l2fwd-qdma l2fwd-crypto ipsec-secgw  kni ip_fragmentation ip_reassembly; do
-            cp -r ${S}/examples/${APP}/${APP}  ${D}/${datadir}/dpdk/examples
-        done
-}
-
-PACKAGES += "${PN}-examples"
-
-FILES:${PN}-dbg += " \
-        ${datadir}/dpdk/.debug \
-        ${datadir}/dpdk/examples/*/.debug \
-        "
-FILES:${PN}-staticdev += "${datadir}/dpdk/cmdif/lib/*.a \
-"
-FILES:${PN}-dev += " \
-        ${datadir}/dpdk/${RTE_TARGET}/.config \
-        ${includedir} \
-        ${includedir}/exec-env \
-        ${datadir}/dpdk/buildtools/ \
-        ${datadir}/dpdk/${RTE_TARGET}/include \
-        ${datadir}/dpdk/${RTE_TARGET}/lib \
-        ${datadir}/dpdk/mk \
-        "
-
-FILES:${PN} += " ${datadir}/ \
-                 ${prefix}/sbin/ \
-                 ${prefix}/bin/ \
-                 ${libdir}/ \
-                 "
-FILES:${PN}-examples += " \
-        ${datadir}/examples/* \
-        "
-
-TOOLCHAIN = "gcc"
-
diff --git a/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch b/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch
deleted file mode 100644
index 383b9085c..000000000
--- a/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9c2b840a1c8ac0fbb638b5cd481909a3f832eed4 Mon Sep 17 00:00:00 2001
-From: Chunrong Guo <chunrong.guo@nxp.com>
-Date: Wed, 3 Jul 2019 08:50:45 +0200
-Subject: [PATCH] Add RTE_KERNELDIR_OUT
-
-Upstream-Status: Pending
-Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
----
- kernel/linux/kni/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
-index 595bac261..28a31f36a 100644
---- a/kernel/linux/kni/Makefile
-+++ b/kernel/linux/kni/Makefile
-@@ -20,7 +20,7 @@ MODULE_CFLAGS += -Wall -Werror
- 
- ifeq ($(DISTRIB_ID),Ubuntu)
- MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE))
--UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \
-+UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR_OUT)/include/generated/utsrelease.h \
-         | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1)
- MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))"
- endif
--- 
-2.17.1
-
diff --git a/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch b/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch
deleted file mode 100644
index b4b8a5488..000000000
--- a/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 354c2d1570ddf83a99c4ac711c884644c6dd1cef Mon Sep 17 00:00:00 2001
-From: "C.r. Guo" <nxa13725@lsv07005.swis.us-cdc01.nxp.com>
-Date: Wed, 27 Mar 2019 09:35:43 +0100
-Subject: [PATCH] add -Wno-cast-function-type
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: "C.r. Guo" <nxa13725@lsv07005.swis.us-cdc01.nxp.com>
----
- examples/cmdif/lib/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/cmdif/lib/Makefile b/examples/cmdif/lib/Makefile
-index 235c3adbf..230f17b0a 100644
---- a/examples/cmdif/lib/Makefile
-+++ b/examples/cmdif/lib/Makefile
-@@ -28,7 +28,7 @@ SRCS-y += server/cmdif_srv_gpp.c
- SRCS-y += shbp/shbp.c
- 
- CFLAGS += -O3
--CFLAGS += $(WERROR_FLAGS)
-+CFLAGS += $(WERROR_FLAGS) -Wno-cast-function-type -Wno-missing-attributes
- CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib
- CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/client
- CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/server
--- 
-2.17.1
-
diff --git a/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch b/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch
deleted file mode 100644
index b73b3a967..000000000
--- a/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 229fc129be85a4d2d2c4efddae7bb97c3d87d416 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 22:02:01 -0700
-Subject: [PATCH] examples: fix Arm build with GCC 12
-
-GCC-12 warns when a pointer of type union points to an array of same
-defined size, as union internally gets paded with pad bytes.
-
-    ../examples/common/neon/port_group.h:42:21: error: array subscript
-            'union <anonymous>[0]' is partly outside array bounds of
-            'uint16_t[5]' {aka 'short unsigned int[5]'}
-            [-Werror=array-bounds]
-       42 |                 pnum->u64 = gptbl[v].pnum;
-          |                     ^~
-    ../examples/common/neon/port_group.h:21:23: note: object 'pn' of
-            size [0, 10]
-       21 | port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1
-          |              ~~~~~~~~~^~~~~~~~~~~~~~~
-    ../examples/common/neon/port_group.h:43:21: error: array subscript
-            'union <anonymous>[0]' is partly outside array bounds of
-            'uint16_t[5]' {aka 'short unsigned int[5]'} [-Werror=array-bounds]
-       43 |                 pnum->u16[FWDSTEP] = 1;
-          |                     ^~
-
-Fixes: 732115ce38c6 ("examples/l3fwd: move packet group function in common")
-
-Upstream-Status: Backport [https://github.com/DPDK/dpdk/commit/b269bd630e96b276a69d698e13ad9ebfbbb67512]
-Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- examples/l3fwd/l3fwd_neon.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/l3fwd/l3fwd_neon.h b/examples/l3fwd/l3fwd_neon.h
-index 86ac5971d7..dc73e9fef7 100644
---- a/examples/l3fwd/l3fwd_neon.h
-+++ b/examples/l3fwd/l3fwd_neon.h
-@@ -77,7 +77,7 @@ port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1,
-        union {
-                uint16_t u16[FWDSTEP + 1];
-                uint64_t u64;
--       } *pnum = (void *)pn;
-+       } __rte_packed *pnum = (void *)pn;
- 
-        int32_t v;
-        uint16x8_t mask = {1, 2, 4, 8, 0, 0, 0, 0};
--- 
-2.39.2
-
diff --git a/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch
deleted file mode 100644
index b1bdf09b4..000000000
--- a/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Explicitly use python3
-
-Upstream-Status: Pending
-Signed-off-by: Ting Liu <ting.liu@nxp.com>
-
-diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py
-index 0194be046..86fe3a89d 100755
---- a/app/test-bbdev/test-bbdev.py
-+++ b/app/test-bbdev/test-bbdev.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2017 Intel Corporation
-diff --git a/app/test-cmdline/cmdline_test.py b/app/test-cmdline/cmdline_test.py
-index 3a8fac426..231fe6032 100755
---- a/app/test-cmdline/cmdline_test.py
-+++ b/app/test-cmdline/cmdline_test.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2010-2014 Intel Corporation
- 
-diff --git a/app/test/autotest.py b/app/test/autotest.py
-index b42f48879..30541d102 100644
---- a/app/test/autotest.py
-+++ b/app/test/autotest.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2010-2014 Intel Corporation
- 
-diff --git a/buildtools/map_to_def.py b/buildtools/map_to_def.py
-index 6775b54a9..ff67f0a35 100644
---- a/buildtools/map_to_def.py
-+++ b/buildtools/map_to_def.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2019 Intel Corporation
- 
-diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py
-index 404866d2f..1f689d9a8 100755
---- a/config/arm/armv8_machine.py
-+++ b/config/arm/armv8_machine.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2017 Cavium, Inc
- 
-diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
-index 616412a1c..3244b0984 100755
---- a/devtools/update_version_map_abi.py
-+++ b/devtools/update_version_map_abi.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2019 Intel Corporation
- 
-diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
-index 6f129b1db..e86bf6b92 100755
---- a/usertools/cpu_layout.py
-+++ b/usertools/cpu_layout.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2010-2014 Intel Corporation
- # Copyright(c) 2017 Cavium, Inc. All rights reserved.
-diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
-index b1d149876..3f8175338 100755
---- a/usertools/dpdk-devbind.py
-+++ b/usertools/dpdk-devbind.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2010-2014 Intel Corporation
- #
-diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py
-index 069a3bf12..1d5c99c2a 100755
---- a/usertools/dpdk-pmdinfo.py
-+++ b/usertools/dpdk-pmdinfo.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2016  Neil Horman <nhorman@tuxdriver.com>
- 
-diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py
-index 290345dcc..279067450 100755
---- a/usertools/dpdk-telemetry-client.py
-+++ b/usertools/dpdk-telemetry-client.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2018 Intel Corporation
- 
diff --git a/recipes-extended/dpdk/dpdk/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/recipes-extended/dpdk/dpdk/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch
deleted file mode 100644
index 4657f070d..000000000
--- a/recipes-extended/dpdk/dpdk/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001
-From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-Date: Fri, 18 Dec 2015 18:30:47 +0800
-Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build
- artifact
-
-Introduce RTE_KERNELDIR_OUT to be the path to which kernel build
-artifacts are located. This is for matching the workflow change
-since Yocto Project v1.8 onwards whereby tmp/work-shared contains
-separate directories for kernel source and kernel artifacts.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
----
- mk/rte.module.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mk/rte.module.mk b/mk/rte.module.mk
-index 53ed4fe..b7a014b 100644
---- a/mk/rte.module.mk
-+++ b/mk/rte.module.mk
-@@ -77,7 +77,7 @@ build: _postbuild
- # build module
- $(MODULE).ko: $(SRCS_LINKS)
-        @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
--       @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
-+       @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
-                CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0)
- 
- # install module in $(RTE_OUTPUT)/kmod
-@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko
- 
- # install module
- modules_install:
--       @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
-+       @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
-                modules_install
- 
- .PHONY: clean
-@@ -98,7 +98,7 @@ clean: _postclean
- .PHONY: doclean
- doclean:
-        @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
--       $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean
-+       $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean
-        @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\
-                if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
-        @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
--- 
-1.9.1
diff --git a/recipes-extended/dpdk/dpdk_19.11-20.12.bb b/recipes-extended/dpdk/dpdk_19.11-20.12.bb
deleted file mode 100644
index b14d4fbf8..000000000
--- a/recipes-extended/dpdk/dpdk_19.11-20.12.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
-                    file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
-
-SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1 \
-           file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
-           file://0001-add-Wno-cast-function-type.patch \
-           file://0001-Add-RTE_KERNELDIR_OUT.patch \
-           file://0005-use-python3-instead-of-python.patch \
-           file://0001-examples-fix-Arm-build-with-GCC-12.patch \
-"
-SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b"
-
-include dpdk.inc
-
-do_install:append () {
-    # Remove the unneeded dir
-    rm -rf ${D}/${datadir}/${RTE_TARGET}/app
-}
-
diff --git a/recipes-extended/dpdk/dpdk_20.11.bb b/recipes-extended/dpdk/dpdk_20.11.bb
deleted file mode 100644
index 2d27adc54..000000000
--- a/recipes-extended/dpdk/dpdk_20.11.bb
+++ /dev/null
@@ -1,93 +0,0 @@
-include dpdk-20.11.inc
-
-SRC_URI += " \
-            file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch \
-            file://0001-ifpga-meson-Fix-finding-librt-using-find_library.patch \
-            file://0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch \
-"
-
-MESON_BUILDTYPE = "release"
-
-# kernel module is provide by dpdk-module recipe, so disable here
-EXTRA_OEMESON = " -Denable_kmods=false \
-                -Dexamples=all \
-                -Doptimization=3 \
-"
-
-PACKAGECONFIG ??= "openssl"
-PACKAGECONFIG[afxdp] = ",,libbpf"
-PACKAGECONFIG[libvirt] = ",,libvirt"
-PACKAGECONFIG[openssl] = ",,openssl"
-
-RDEPENDS:${PN} += "bash pciutils python3-core"
-RDEPENDS:${PN}-examples += "bash"
-DEPENDS = "numactl"
-
-inherit meson
-
-INSTALL_PATH = "${prefix}/share/dpdk"
-
-do_configure:prepend() {
-    sed -i "/implementor_/d" ${WORKDIR}/meson.cross
-    sed -i "/\[properties]/aimplementor_id = 'dpaa'" ${WORKDIR}/meson.cross
-    sed -i "/\[properties]/aimplementor_pn = 'default'" ${WORKDIR}/meson.cross
-    sed -i "s/cpu =.*/cpu = 'armv8-a'/" ${WORKDIR}/meson.cross
-}
-
-do_install:append(){
-    # remove source files
-    rm -rf ${D}/${INSTALL_PATH}/examples/*
-
-    # Install examples
-    install -m 0755 -d ${D}/${INSTALL_PATH}/examples/
-    for dirname in ${B}/examples/dpdk-*
-    do
-        if [ ! -d ${dirname} ] && [ -x ${dirname} ]; then
-            install -m 0755 ${dirname} ${D}/${INSTALL_PATH}/examples/
-        fi
-    done
-    cp -rf ${S}/nxp/* ${D}/${INSTALL_PATH}/
-}
-
-PACKAGES =+ "${PN}-tools ${PN}-examples ${PN}-misc"
-
-FILES:${PN}-tools = " \
-    ${bindir}/dpdk-testpmd \
-    ${INSTALL_PATH}/examples/dpdk-l2fwd \
-    ${INSTALL_PATH}/examples/dpdk-l2fwd-crypto \
-    ${INSTALL_PATH}/examples/dpdk-l3fwd \
-    ${INSTALL_PATH}/examples/dpdk-ipsec-secgw \
-"
-
-FILES:${PN}-examples = " \
-    ${bindir}/dpdk-proc-info \
-    ${bindir}/dpdk-test \
-    ${bindir}/dpdk-test-crypto-perf \
-    ${bindir}/dpdk-*.py \
-    ${INSTALL_PATH}/examples/dpdk-cmdif \
-    ${INSTALL_PATH}/examples/dpdk-cmdline \
-    ${INSTALL_PATH}/examples/dpdk-ethtool \
-    ${INSTALL_PATH}/examples/dpdk-ip_fragmentation \
-    ${INSTALL_PATH}/examples/dpdk-ip_reassembly \
-    ${INSTALL_PATH}/examples/dpdk-kni \
-    ${INSTALL_PATH}/examples/dpdk-l2fwd-keepalive \
-    ${INSTALL_PATH}/examples/dpdk-l2fwd-qdma \
-    ${INSTALL_PATH}/examples/dpdk-l3fwd-acl \
-    ${INSTALL_PATH}/examples/dpdk-link_status_interrupt \
-    ${INSTALL_PATH}/examples/dpdk-mp_client \
-    ${INSTALL_PATH}/examples/dpdk-mp_server \
-    ${INSTALL_PATH}/examples/dpdk-qdma_demo \
-    ${INSTALL_PATH}/examples/dpdk-simple_mp \
-    ${INSTALL_PATH}/examples/dpdk-symmetric_mp \
-    ${INSTALL_PATH}/examples/dpdk-symmetric_mp_qdma \
-    ${INSTALL_PATH}/examples/dpdk-timer \
-"
-
-FILES:${PN}-misc = " \
-    ${bindir}/dpdk-pdump \
-    ${bindir}/dpdk-test-* \
-    ${bindir}/dpdk-*.py \
-    ${INSTALL_PATH}/examples/* \
-"
-
-INSANE_SKIP:${PN} = "dev-so"
diff --git a/recipes-extended/dpdk/dpdk_22.11.bb b/recipes-extended/dpdk/dpdk_22.11.bb
new file mode 100644
index 000000000..727106e49
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk_22.11.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "Data Plane Development Kit"
+HOMEPAGE = "http://dpdk.org"
+LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
+                    file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
+
+DEPENDS = "python3-pyelftools-native"
+
+DPDK_SRC ?= "git://github.com/nxp-qoriq/dpdk;protocol=https"
+SRC_URI = "${DPDK_SRC};nobranch=1 \
+          file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch"
+SRCREV = "e09ece7ebcda131ee3d5a45999ad3396ee2092ae"
+
+inherit meson pkgconfig
+
+PACKAGECONFIG ??= "openssl examples"
+
+PACKAGECONFIG[afxdp] = ",,libbpf"
+PACKAGECONFIG[examples] = "-Denable_examples_bin_install=true -Dexamples=${DPDK_EXAMPLES},-Denable_examples_bin_install=false"
+PACKAGECONFIG[libvirt] = ",,libvirt"
+PACKAGECONFIG[openssl] = ",,openssl"
+
+DPDK_EXAMPLES ?= "l2fwd,l3fwd,l2fwd-crypto,ipsec-secgw,ip_fragmentation,ip_reassembly,qdma_demo,timer,multi_process/simple_mp"
+DPDK_APPS ?= "pdump,test-pmd,proc-info,test-crypto-perf"
+
+# kernel module is provide by dpdk-module recipe, so disable here
+EXTRA_OEMESON = " \
+        -Denable_kmods=false \
+        -Doptimization=3 \
+        --cross-file ${S}/config/arm/arm64_poky_linux_gcc \
+        -Denable_driver_sdk=true \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'vpp', '-Dc_args="-Ofast -fPIC -ftls-model=local-dynamic"', '', d)} \
+        -Denable_examples_source_install=false \
+        -Ddrivers_install_subdir= \
+        -Denable_apps=${DPDK_APPS} \
+"
+
+do_install:append(){
+    install -d ${D}/${sysconfdir}/dpdk
+    cp -rf ${S}/nxp/* ${D}/${sysconfdir}/dpdk
+}
+
+RDEPENDS:${PN} += "bash pciutils python3-core python3-pyelftools"
+
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
+
+CVE_PRODUCT = "data_plane_development_kit"
diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch b/recipes-extended/dpdk/files/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch
index bef1f45b5..fed893a08 100644
--- a/recipes-extended/dpdk/dpdk-20.11/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch
+++ b/recipes-extended/dpdk/files/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch
@@ -14,21 +14,21 @@ diff --git a/config/meson.build b/config/meson.build
 index 2f150de3b8..41bb3e9ec4 100644
 --- a/config/meson.build
 +++ b/config/meson.build
-@@ -94,12 +94,12 @@ dpdk_conf.set('RTE_MACHINE', machine)
+@@ -127,12 +127,12 @@ dpdk_conf.set('RTE_MACHINE', cpu_instruction_set)
  machine_args = []
  
  # ppc64 does not support -march= at all, use -mcpu and -mtune for that
 -if host_machine.cpu_family().startswith('ppc')
--       machine_args += '-mcpu=' + machine
--       machine_args += '-mtune=' + machine
+-    machine_args += '-mcpu=' + cpu_instruction_set
+-    machine_args += '-mtune=' + cpu_instruction_set
 -else
--       machine_args += '-march=' + machine
+-    machine_args += '-march=' + cpu_instruction_set
 -endif
 +#if host_machine.cpu_family().startswith('ppc')
-+#      machine_args += '-mcpu=' + machine
-+#      machine_args += '-mtune=' + machine
++#    machine_args += '-mcpu=' + cpu_instruction_set
++#    machine_args += '-mtune=' + cpu_instruction_set
 +#else
-+#      machine_args += '-march=' + machine
++#    machine_args += '-march=' + cpu_instruction_set
 +#endif
  
  toolchain = cc.get_id()
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
deleted file mode 100644
index a21bc69cf..000000000
--- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "OVS DPDK"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
-
-DEPENDS = "dpdk python3-six-native coreutils-native autoconf-native automake-native"
-RDEPENDS:${PN} = "bash libcrypto libssl python3"
-
-inherit python3native pkgconfig
-
-SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1"
-SRCREV = "f2c0744d2f68c4cd2840d6e409d7b0520e4caf99"
-
-do_configure() {
-        export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
-        ${S}/boot.sh
-        ${S}/configure --host aarch64-fsl-linux --with-dpdk=static --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast" 
-}
-
-do_install:append() {
-        install -d ${D}${bindir}/ovs-dpdk
-        cp -rf  ${S}/ovsdb/ovsdb-tool ${D}${bindir}/ovs-dpdk
-        cp -rf  ${S}/ovsdb/ovsdb-server ${D}${bindir}/ovs-dpdk
-        cp -rf  ${S}/ovsdb/ovsdb-client ${D}${bindir}/ovs-dpdk
-        cp -rf  ${S}/vswitchd/vswitch.ovsschema ${D}${bindir}/ovs-dpdk
-        cp -rf  ${S}/vswitchd/ovs-vswitchd ${D}${bindir}/ovs-dpdk
-        cp -rf  ${S}/utilities/ovs-vsctl ${D}${bindir}/ovs-dpdk
-        cp -rf  ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk
-        chmod 777 -R ${D}${bindir}/ovs-dpdk/*
-}
-
-ALLOW_EMPTY:${PN} = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
new file mode 100644
index 000000000..5f235b4cf
--- /dev/null
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Open Virtual switch based on DPDK"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
+
+DEPENDS = "dpdk python3-six-native coreutils-native autoconf-native automake-native"
+RDEPENDS:${PN} = "bash libcrypto libssl python3"
+
+inherit python3native pkgconfig
+
+SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1"
+SRCREV = "7b4861e1f77bbea5ff9952717b66362fdecbca4d"
+
+do_configure() {
+    export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
+    ${S}/boot.sh
+    ${S}/configure --host aarch64-fsl-linux --with-dpdk=static --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast" 
+}
+
+do_install:append() {
+    install -d ${D}${bindir}/ovs-dpdk
+    install -m 0755 ${S}/ovsdb/ovsdb-tool ${D}${bindir}/ovs-dpdk
+    install -m 0755 ${S}/ovsdb/ovsdb-server ${D}${bindir}/ovs-dpdk
+    install -m 0755 ${S}/ovsdb/ovsdb-client ${D}${bindir}/ovs-dpdk
+    install -m 0755 ${S}/vswitchd/vswitch.ovsschema ${D}${bindir}/ovs-dpdk
+    install -m 0755 ${S}/vswitchd/ovs-vswitchd ${D}${bindir}/ovs-dpdk
+    install -m 0755 ${S}/utilities/ovs-vsctl ${D}${bindir}/ovs-dpdk
+    install -m 0755 ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk
+}
+
+INSANE_SKIP:${PN}-dbg += " buildpaths"
+INSANE_SKIP:${PN} += " buildpaths"
+
+ALLOW_EMPTY:${PN} = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-fsl/mcore-demos/README b/recipes-fsl/mcore-demos/README
index 389e46bba..25013f996 100644
--- a/recipes-fsl/mcore-demos/README
+++ b/recipes-fsl/mcore-demos/README
@@ -1,13 +1,15 @@
 The M4 demo app version of each SoCs are followed:
 * 2.16.000 -- i.MX 7ULP
-* 25.03.00 -- i.MX 8MQ, 8MM
+* 25.09.00 -- i.MX 8MQ, 8MM
 * 2.9.0 -- i.MX 8DXL, 8QM, 8QXP
 * 1.0.1 -- i.MX 7D
 
 The M7 demo app version of each SoCs are followed:
-* 25.03.00 --  i.MX 8MP , 8MNULite, 8MN
-* 25.06.00 --  i.MX95
+* 25.09.00 --  i.MX 8MP , 8MNULite, 8MN
+* 25.12.00 --  i.MX95
 
 The M33 demo app version of each SoCs are followed:
-* 25.03.00 --  i.MX 8ULP
-* 25.06.00 --  i.MX 93
+* 25.12.00 --  i.MX 8ULP, 93
+
+The MCore demo app version of each SoCs are followed:
+* 25.12.00 --  i.MX 943
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb b/recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb
deleted file mode 100644
index 3f4bdf04e..000000000
--- a/recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2023-2025 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos.inc
-
-LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-
-SRC_URI[imx8ulp.sha256sum] = "8147efc6b1da5aa9bbda8cc06c8aa0d03455f74d8c85a988db5e3f839717e190"
-
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp)"
-
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb b/recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb
deleted file mode 100644
index 75add4585..000000000
--- a/recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2023-2025 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos.inc
-
-LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-
-SRC_URI[imx93.sha256sum] = "275256ab9a7aca0b72dbd2ddb4f237f2ad9b02a83ae63242b2d9e6804a918b93"
-
-COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
-
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_25.12.00.bb b/recipes-fsl/mcore-demos/imx-m33-demos_25.12.00.bb
new file mode 100644
index 000000000..4cf087859
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m33-demos_25.12.00.bb
@@ -0,0 +1,15 @@
+# Copyright 2023-2026 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+
+LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+
+SRC_URI[imx8ulp.sha256sum] = "115905810d24887cf14ed081b4f52c2ca846d94ee5ba6bf459790d3151af78d2"
+
+SRC_URI[imx93.sha256sum] = "fbaf3baa6916757747696ba90a23d515ee10215b19a03e9feb5d6b16cc4d6a4f"
+
+COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)"
+
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb b/recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb
deleted file mode 100644
index 7c59ccfba..000000000
--- a/recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017-2025 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos.inc
-
-LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-
-SRC_URI[imx8mm.sha256sum] = "30fcf9032a3bd71211b8df03c654acf98d5dd4631d18a34635d5b1ba61201d6c"
-SRC_URI[imx8mq.sha256sum] = "652c0521587d9594d56115b549b23d75ea598237f36a79d5a7eede97d9f56574"
-
-COMPATIBLE_MACHINE = "(mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
-
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_25.09.00.bb b/recipes-fsl/mcore-demos/imx-m4-demos_25.09.00.bb
new file mode 100644
index 000000000..d096cf9dc
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_25.09.00.bb
@@ -0,0 +1,13 @@
+# Copyright 2017-2026 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+
+SRC_URI[imx8mm.sha256sum] = "b2a08b5d5aeb23ffb9d30f915a551c891c997d6ed55f12a9e21103b6153752cc"
+SRC_URI[imx8mq.sha256sum] = "9cd1e2e1f328911ea7fb13cd4da213a2ca0d08108963ca501c694edad100ec3f"
+
+COMPATIBLE_MACHINE = "(mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
+
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
index 0527ddffd..224a164f6 100644
--- a/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
@@ -1,19 +1,18 @@
-# Copyright 2023-2025 NXP
+# Copyright 2023-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 require imx-mcore-demos.inc
 
-LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 
-LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 
-SRC_URI[imx8mn.sha256sum] = "66e160a4267efcd2660b932d46ad6bcc645c9f2865c8ea873d4194d67fcf342c"
+SRC_URI[imx8mn.sha256sum] = "6fb7bfad067f0dda55ce7d6e1f688da8d979e3a75a0a3e1325ad10684ce943b3"
+SRC_URI[imx8mnddr3l.sha256sum] = "e107ca6f12e863368133a881d8b848813bdad77249777926880dffbebd3c30c9"
 
-SRC_URI[imx8mnddr3l.sha256sum] = "45c770ed5539c5e0d5dd8aee2ad0a6ef91b28c99be3aaa9f336bda6ec34a7083"
-
-SRC_URI[imx8mp.sha256sum] = "94b85ec4dcbf1664a8997e3cfb7bde6b7f1e5825482096302971a7da853b145f"
+SRC_URI[imx8mp.sha256sum] = "d97c215a466bc4155ca96b6c6697f1512d6650c29241559ffefa52de0eaf8535"
 
 COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp)"
 
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb
deleted file mode 100644
index 608b2dc45..000000000
--- a/recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2023-2025 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos.inc
-
-LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-
-SRC_URI[imx95.sha256sum] = "8b33ca53bd2692ba92fe928c42d0ec75f1abd3f33879f71660efca9983e9eb88"
-
-COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
-
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_25.12.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_25.12.00.bb
new file mode 100644
index 000000000..5154866cf
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_25.12.00.bb
@@ -0,0 +1,11 @@
+# Copyright 2023-2026 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac" 
+
+SRC_URI[imx95.sha256sum] = "1ed885757d570a1bcd4309cd41d158827f855af451d140d056fa02f92e8b73eb"
+
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
+
diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos.inc b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
index 9b9553fcc..2375e471d 100644
--- a/recipes-fsl/mcore-demos/imx-mcore-demos.inc
+++ b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
@@ -22,6 +22,7 @@ SOC:mx8qxp-nxp-bsp  = "imx8qx"
 SOC:mx8dx-nxp-bsp   = "imx8qx"
 SOC:mx8ulp-nxp-bsp  = "imx8ulp"
 SOC:mx93-nxp-bsp    = "imx93"
+SOC:mx94-nxp-bsp    = "imx943"
 SOC:mx95-nxp-bsp    = "imx95"
 
 MCORE_TYPE  ?= "m4"
@@ -31,6 +32,7 @@ MCORE_TYPE:mx8mp-nxp-bsp  = "m7"
 MCORE_TYPE:mx8mpul-nxp-bsp  = "m7"
 MCORE_TYPE:mx8ulp-nxp-bsp  = "m33"
 MCORE_TYPE:mx93-nxp-bsp  = "m33"
+MCORE_TYPE:mx943-nxp-bsp  = "mcore"
 MCORE_TYPE:mx95-nxp-bsp  = "m7"
 
 SRC_URI = "${FSL_MIRROR}/${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true"
diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos_25.12.00.bb b/recipes-fsl/mcore-demos/imx-mcore-demos_25.12.00.bb
new file mode 100644
index 000000000..380821658
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-mcore-demos_25.12.00.bb
@@ -0,0 +1,10 @@
+# Copyright 2025 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM:mx943-nxp-bsp = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+
+SRC_URI[imx943.sha256sum] = "52acc5cb421ae98b9b496512035f1635be7238c2f15178f62277269e4744b95a"
+
+COMPATIBLE_MACHINE = "(mx943-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index ab29270b9..3b05b2abd 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -61,12 +61,6 @@ PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
 
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
 
-RPROVIDES_OPENCL               = "opencl-icd-loader-dev"
-RPROVIDES_OPENCL:mx7-nxp-bsp   = ""
-RPROVIDES_OPENCL:mx8mm-nxp-bsp = ""
-
-RPROVIDES:${PN}:append:imx-nxp-bsp = " ${RPROVIDES_OPENCL}"
-
 PE = "1"
 
 inherit fsl-eula-unpack
@@ -393,6 +387,9 @@ FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \
                        ${sysconfdir}/OpenCL/vendors/Vivante.icd"
 FILES:libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
 RDEPENDS:libopencl-imx = "libclc-imx"
+RPROVIDES:libopencl-imx               = "virtual-opencl-icd"
+RPROVIDES:libopencl-imx:mx7-nxp-bsp   = ""
+RPROVIDES:libopencl-imx:mx8mm-nxp-bsp = ""
 
 FILES:libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}"
 FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/pkgconfig/vg.pc"
diff --git a/recipes-graphics/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
index 87f73440f..97a1175e7 100644
--- a/recipes-graphics/mali/mali-imx.inc
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -43,6 +43,7 @@ FILES:${PN}-libgles2 = " \
     ${libdir}/libGLESv2${SOLIBS}"
 FILES:${PN}-opencl-icd = " \
     ${sysconfdir}/OpenCL"
+RPROVIDES:${PN}-opencl-icd = "virtual-opencl-icd"
 FILES:${PN}-libvulkan = " \
     ${sysconfdir}/vulkan"
 RDEPENDS:${PN}-libvulkan = "vulkan-wsi-layer"
diff --git a/recipes-graphics/mesa/mesa.bbappend b/recipes-graphics/mesa/mesa.bbappend
index 1c75c9884..926f57589 100644
--- a/recipes-graphics/mesa/mesa.bbappend
+++ b/recipes-graphics/mesa/mesa.bbappend
@@ -1,46 +1,3 @@
-PROVIDES:remove:imxgpu   = "virtual/egl"
-PROVIDES:remove:imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2"
-
-PACKAGECONFIG:remove:imxgpu   = "egl gbm"
-PACKAGECONFIG:remove:imxgpu3d = "gles"
-
-# FIXME: mesa should support 'x11-no-tls' option
-python () {
-    overrides = d.getVar("OVERRIDES").split(":")
-    if "imxgpu2d" not in overrides:
-        return
-
-    x11flag = d.getVarFlag("PACKAGECONFIG", "x11", False)
-    d.setVarFlag("PACKAGECONFIG", "x11", x11flag.replace("--enable-glx-tls", "--enable-glx"))
-}
-
 # Enable Etnaviv and Freedreno support
 PACKAGECONFIG:append:use-mainline-bsp = " gallium etnaviv freedreno"
-
-# For NXP BSP, GPU drivers don't support dri
-PACKAGECONFIG:remove:imxgpu:use-nxp-bsp = "dri"
-
-# mainline/etnaviv:
 RRECOMMENDS:${PN}-megadriver:append:use-mainline-bsp = " libdrm-etnaviv mesa-etnaviv-env"
-
-BACKEND = \
-    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
-        bb.utils.contains('DISTRO_FEATURES',     'x11',     'x11', \
-                                                             'fb', d), d)}"
-
-# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
-do_install:append:imxgpu3d () {
-    rm -f ${D}${libdir}/libGL.* \
-          ${D}${includedir}/GL/gl.h \
-          ${D}${includedir}/GL/glcorearb.h \
-          ${D}${includedir}/GL/glext.h \
-          ${D}${includedir}/GL/glx.h \
-          ${D}${includedir}/GL/glxext.h
-    if [ "${BACKEND}" = "x11" ]; then
-        rm -f ${D}${libdir}/pkgconfig/gl.pc
-    fi
-}
-
-do_install:append:imxgpu () {
-    rm -rf ${D}${includedir}/KHR
-}
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch
deleted file mode 100644
index 960bf3b50..000000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c76f5d2c0a0dda534888025d7236465202884665 Mon Sep 17 00:00:00 2001
-From: Xianzhong <xianzhong.li@nxp.com>
-Date: Thu, 5 Aug 2021 16:57:43 +0800
-Subject: [PATCH] glamor: Fix fbo pixmap format with GL_BGRA_EXT
-
-Red and Blue channels are swizzled in GLES path,
-Fix color inverse problem with ximagesink command:
-gst-launch-1.0 videotestsrc pattern=6 num-buffers=1 ! video/x-raw,format=BGRx ! videoconvert ! ximagesink display=:0 -v
-
-This fix requires GL_EXT_texture_format_BGRA8888 extention, not applicable for upstream.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
----
- glamor/glamor.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -586,10 +586,17 @@ glamor_setup_formats(ScreenPtr screen)
- 
-     if (glamor_priv->is_gles) {
-         assert(X_BYTE_ORDER == X_LITTLE_ENDIAN);
-+#if GL_EXT_texture_format_BGRA8888
-+        glamor_add_format(screen, 24, PICT_x8r8g8b8,
-+                          GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE);
-+        glamor_add_format(screen, 32, PICT_a8r8g8b8,
-+                          GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE);
-+#else
-         glamor_add_format(screen, 24, PICT_x8b8g8r8,
-                           GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE);
-         glamor_add_format(screen, 32, PICT_a8b8g8r8,
-                           GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE);
-+#endif
-     } else {
-         glamor_add_format(screen, 24, PICT_x8r8g8b8,
-                           GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE);
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index cf1c3a50f..161df0498 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -2,8 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch"
 
-SRC_URI:append:imxgpu = " file://0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch"
-
 IMX_OPENGL_PKGCONFIGS_REMOVE        = ""
 IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
 OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp        = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
diff --git a/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch b/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch
new file mode 100644
index 000000000..93b375eaa
--- /dev/null
+++ b/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch
@@ -0,0 +1,28 @@
+From 9049175076c4d6706e6264f894680d5d1845e409 Mon Sep 17 00:00:00 2001
+From: Zelan Zou <zelan.zou@nxp.com>
+Date: Fri, 13 Sep 2024 04:22:13 +0200
+Subject: [PATCH] Makefile: Fix build error with gcc15 [YOCIMX-8305]
+
+Upstream-Status: Pending
+
+Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9e55dad..60f8f7f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@ LDFLAGS += -Wl,-export-dynamic
+ # if you are not using flex-builder. Download the iproute2 sources for the
+ # desired version and point to those instead.
+ ifneq ($(IPROUTE2_DIR),)
+-CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include -I$(IPROUTE2_DIR)/usr/include/ -I$(IPROUTE2_DIR)/usr/include/include
++CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include -I$(IPROUTE2_DIR)/usr/include/ -I$(IPROUTE2_DIR)/usr/include/include -Wno-error=incompatible-pointer-types
+ endif
+ 
+ MODDESTDIR := $(DESTDIR)/usr/lib/tc
+-- 
+2.25.1
+
diff --git a/recipes-kernel/ceetm/ceetm/0001-use-new-api-tc_print_rate.patch b/recipes-kernel/ceetm/ceetm/0001-use-new-api-tc_print_rate.patch
deleted file mode 100644
index bd077f8ac..000000000
--- a/recipes-kernel/ceetm/ceetm/0001-use-new-api-tc_print_rate.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 1eeee62be6f4f4c0564a1ebbf47b5d1ebd7ab282 Mon Sep 17 00:00:00 2001
-From: Ting Liu <ting.liu@nxp.com>
-Date: Thu, 15 Apr 2021 14:43:31 +0530
-Subject: [PATCH] use new api tc_print_rate
-
-Fix the build issue due to api change in iproute2:
-| dpaa1_ceetm.c:637:4: error: too few arguments to function 'print_rate'
-| print_rate(buf, sizeof(buf), qopt->rate);
-| ^~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Ting Liu <ting.liu@nxp.com>
----
- dpaa1_ceetm.c | 12 ++++--------
- dpaa2_ceetm.c |  6 ++----
- 2 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/dpaa1_ceetm.c b/dpaa1_ceetm.c
-index 15a2cd8..347e79a 100644
---- a/dpaa1_ceetm.c
-+++ b/dpaa1_ceetm.c
-@@ -634,11 +634,9 @@ int dpaa1_ceetm_print_qopt(struct qdisc_util *qu, FILE *f,
-                fprintf(f, "type root");
- 
-                if (qopt->shaped) {
--                       print_rate(buf, sizeof(buf), qopt->rate);
--                       fprintf(f, " shaped rate %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, " shaped rate %s ", qopt->rate);
- 
--                       print_rate(buf, sizeof(buf), qopt->ceil);
--                       fprintf(f, "ceil %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "ceil %s ", qopt->ceil);
- 
-                        fprintf(f, "overhead %u ", qopt->overhead);
- 
-@@ -692,11 +690,9 @@ int dpaa1_ceetm_print_copt(struct qdisc_util *qu, FILE *f,
-                fprintf(f, "type root ");
- 
-                if (copt->shaped) {
--                       print_rate(buf, sizeof(buf), copt->rate);
--                       fprintf(f, "shaped rate %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "shaped rate %s ", copt->rate);
- 
--                       print_rate(buf, sizeof(buf), copt->ceil);
--                       fprintf(f, "ceil %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "ceil %s ", copt->ceil);
- 
-                } else {
-                        fprintf(f, "unshaped tbl %d", copt->tbl);
-diff --git a/dpaa2_ceetm.c b/dpaa2_ceetm.c
-index 6b1b033..0505046 100644
---- a/dpaa2_ceetm.c
-+++ b/dpaa2_ceetm.c
-@@ -516,11 +516,9 @@ int dpaa2_ceetm_print_copt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
-                fprintf(f, "type root ");
- 
-                if (copt->shaped) {
--                       print_rate(buf, sizeof(buf), copt->shaping_cfg.cir);
--                       fprintf(f, "CIR %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "CIR %s ", copt->shaping_cfg.cir);
- 
--                       print_rate(buf, sizeof(buf), copt->shaping_cfg.eir);
--                       fprintf(f, "EIR %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "EIR %s ", copt->shaping_cfg.eir);
- 
-                        fprintf(f, "CBS %d EBS %d ", copt->shaping_cfg.cbs, copt->shaping_cfg.ebs);
- 
--- 
-2.25.1
-
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 947a31280..2356b8db4 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -3,9 +3,9 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/nxp-qoriq/ceetm;protocol=https;nobranch=1"
-SRCREV = "27218bc625e83458db2301f6c07de133cb5f6792"
+SRCREV = "46b3565a48ca20f90ad601cef8250cdd35f18b22"
 SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \
-    file://0001-use-new-api-tc_print_rate.patch \
+                   file://0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch \
 "
 DEPENDS = "iproute2"
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb
index 8670443db..dc0f2886f 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.2.bb
@@ -7,12 +7,13 @@ allowing flexibility to use a newer graphics release with an older kernel."
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI = "${LINUX_IMX_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${S}/src \
+SRC_URI = "${LINUX_IMX_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${BP}/src \
            file://Add-makefile.patch"
+
 LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.20-2.0.0"
-SRCREV = "d53b3fa8a69bef5ead825e81aa62dbdd08e1409c"
+LOCALVERSION = "-lts-${SRCBRANCH}"
+SRCREV = "807e28f65f46b131a698a4c62e2cc0b6b4682731"
 
 S = "${UNPACKDIR}/${BP}"
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb
deleted file mode 100644
index 058d9e0d8..000000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2020-2025 NXP
-
-DESCRIPTION = "Kernel loadable module for ISP"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
-
-SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
-ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
-SRCBRANCH = "lf-6.12.y_2.0.0"
-SRCREV = "dc686fbb8b5b2f4cbc58d83756f65ad970b03ac2"
-
-
-S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
-
-inherit module
-
-MODULES_MODULE_SYMVERS_LOCATION = "dwe"
-
-DEBUG_PREFIX_MAP:prepend = " \
-    -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
-    -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
-
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb
new file mode 100644
index 000000000..2da42a7dc
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.4.bb
@@ -0,0 +1,23 @@
+# Copyright 2020-2023 NXP
+
+DESCRIPTION = "Kernel loadable module for ISP"
+LICENSE = "GPL-2.0-only"
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
+ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
+SRCBRANCH = "lf-6.12.y_2.2.0"
+SRCREV = "ad057a15dd57e053e3596ae83b45ea96835acd3e"
+
+S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
+
+inherit module
+
+MODULES_MODULE_SYMVERS_LOCATION = "dwe"
+
+DEBUG_PREFIX_MAP:prepend = " \
+    -fmacro-prefix-map=${WORKDIR}/sources=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+    -fdebug-prefix-map=${WORKDIR}/sources=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
+
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 2341ab0c9..48f1ad724 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -2,20 +2,24 @@ SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/610/612"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
 
-# For backwards compatibility
 PROVIDES += "kernel-module-nxp89xx"
 RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 
-SRCBRANCH = "lf-6.12.20_2.0.0"
+KERNEL_MODULE_PROBECONF += "moal"
+module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf"
+
+SRCBRANCH = "lf-6.12.49_2.2.0"
 MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = " \
     ${MRVL_SRC};branch=${SRCBRANCH} \
     file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
 "
-SRCREV = "7a8beaa1605cb0870dc7ba3312c76df91cb0d6cf"
+SRCREV = "84ca65c9ff935d7f2999af100a82531c22c65234"
 
 inherit module
 
 EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}"
+
+KERNEL_MODULE_AUTOLOAD += "moal"
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
deleted file mode 100644
index 1750d6247..000000000
--- a/recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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.12.bb b/recipes-kernel/linux/linux-imx-headers_6.18.bb
index ed2478965..c6a3786c9 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.12.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.18.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2025 NXP
+# Copyright 2017-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 SUMMARY = "Installs i.MX-specific kernel headers"
@@ -7,13 +7,13 @@ New headers are installed in ${includedir}/imx."
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-SRC_URI = " \
-    git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
-    file://0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch \
-"
-SRCBRANCH = "lf-6.12.y"
+SRC_URI = "${LINUX_IMX_SRC}"
+LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-6.18.y"
 LOCALVERSION = "-lts-${SRCBRANCH}"
-SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
+KBRANCH = "${SRCBRANCH}"
+SRCREV = "f49f45233f7b10006ce7e9c826ee882bb14ac8b5"
+
 
 do_configure[noexec] = "1"
 
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 521bd7948..d704e2921 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -17,7 +17,7 @@ PROVIDES += "linux-mfgtool"
 # Set the PV to the correct kernel version to satisfy the kernel version sanity check
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 
 # Tell to kernel class that we would like to use our defconfig to configure the kernel.
 # Otherwise, the --allnoconfig would be used per default which leads to mis-configured
diff --git a/recipes-kernel/linux/linux-imx_6.12.bb b/recipes-kernel/linux/linux-imx_6.12.bb
deleted file mode 100644
index 267a33542..000000000
--- a/recipes-kernel/linux/linux-imx_6.12.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2013-2016 (C) Freescale Semiconductor
-# Copyright 2017-2025 (C) NXP
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-#
-# SPDX-License-Identifier: MIT
-#
-
-SUMMARY = "Linux Kernel provided and supported by NXP"
-DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
-i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
-
-require recipes-kernel/linux/linux-imx.inc
-
-SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.20-2.0.0"
-SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
-
-# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
-# required by kernel-yocto.bbclass.
-#
-# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
-# should be updated once patchlevel is merged.
-LINUX_VERSION = "6.12.20"
-
-KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
-KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
-KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig"
-KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig"
-
-DEFAULT_PREFERENCE = "1"
-
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-kernel/linux/linux-imx_6.18.bb b/recipes-kernel/linux/linux-imx_6.18.bb
new file mode 100644
index 000000000..5010f66c7
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx_6.18.bb
@@ -0,0 +1,63 @@
+# Copyright 2013-2016 Freescale Semiconductor
+# Copyright 2017-2026 NXP
+# Copyright 2018 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# SPDX-License-Identifier: MIT
+#
+
+SUMMARY = "Linux Kernel provided and supported by NXP"
+DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
+i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
+
+require recipes-kernel/linux/linux-imx.inc
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+DEPENDS += "coreutils-native"
+
+SRC_URI = "${LINUX_IMX_SRC}"
+LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-6.18.y"
+KBRANCH = "${SRCBRANCH}"
+LOCALVERSION = "-1.0.0"
+SRCREV = "f49f45233f7b10006ce7e9c826ee882bb14ac8b5"
+
+# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
+# required by kernel-yocto.bbclass.
+#
+# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
+# should be updated once patchlevel is merged.
+LINUX_VERSION = "6.18.2"
+
+KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
+KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
+KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig"
+KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig"
+
+DEFAULT_PREFERENCE = "1"
+
+python __anonymous () {
+    import bb
+    # Fail fast if DELTA_KERNEL_DEFCONFIG is present in the datastore (even if empty)
+    if "DELTA_KERNEL_DEFCONFIG" in d.keys():
+        val = d.getVar("DELTA_KERNEL_DEFCONFIG", expand=False)
+        bb.error(f"Detected deprecated/unsupported variable 'DELTA_KERNEL_DEFCONFIG' (value: '{val}').")
+        bb.fatal("Please remove 'DELTA_KERNEL_DEFCONFIG' and use supported kernel configuration methods, "
+                 "e.g., configuration fragments via kernel-yocto or a maintained defconfig.")
+}
+
+do_deploy:append() {
+    if [ ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} ]; then
+        baseName=${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_NAME}
+        gzip -c ${DEPLOYDIR}/$baseName${KERNEL_IMAGE_BIN_EXT} > \
+            ${DEPLOYDIR}/$baseName${KERNEL_IMAGE_BIN_EXT}.gz
+        ln -sf $baseName${KERNEL_IMAGE_BIN_EXT}.gz $deployDir/${KERNEL_IMAGETYPE}.gz
+        # FIXME: For now, the CRRM kernel is just a copy of the regular kernel
+        ln -sf $baseName${KERNEL_IMAGE_BIN_EXT}    $deployDir/${KERNEL_IMAGETYPE}_crrm
+        ln -sf $baseName${KERNEL_IMAGE_BIN_EXT}.gz $deployDir/${KERNEL_IMAGETYPE}_crrm.gz
+    fi
+}
+
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 09de1ba0a..8c89a33aa 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -22,17 +22,11 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SCMVERSION ?= "y"
 LOCALVERSION = ""
 
-DELTA_KERNEL_DEFCONFIG ?= ""
-DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm64 = "lsdk.config "
-DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm = "multi_v7_lpae.config lsdk.config "
+KBUILD_DEFCONFIG = "${KERNEL_DEFCONFIG}"
+EXTRA_KBUILD_DEFCONFIG:qoriq-arm64 = "lsdk.config"
+EXTRA_KBUILD_DEFCONFIG:qoriq-arm   = "multi_v7_lpae.config lsdk.config"
 
-do_merge_delta_config[depends] += "virtual/cross-cc:do_populate_sysroot bison-native:do_populate_sysroot"
-do_merge_delta_config[dirs] = "${B}"
-do_kernel_metadata[noexec] = "1"
-do_kernel_configme[noexec] = "1"
-do_kernel_configcheck[noexec] = "1"
-
-do_merge_delta_config() {
+do_configure() {
     # create config with make config
     oe_runmake  -C ${S} O=${B} ${KERNEL_DEFCONFIG}
 
@@ -41,9 +35,7 @@ do_merge_delta_config() {
         echo "CONFIG_CPU_BIG_ENDIAN=y" >> .config
         echo "CONFIG_MTD_CFI_BE_BYTE_SWAP=y" >> .config
     fi
-
-    # add config fragments
-    for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
+    for deltacfg in ${EXTRA_KBUILD_DEFCONFIG}; do
         if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then
             oe_runmake  -C ${S} O=${B} ${deltacfg}
         elif [ -f "${S}/${deltacfg}" ]; then
@@ -55,8 +47,6 @@ do_merge_delta_config() {
     cp .config ${UNPACKDIR}/defconfig
 }
 
-addtask merge_delta_config before do_kernel_localversion after do_patch
-
 FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*"
 INSANE_SKIP:${PN}-src += " buildpaths"
 COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-kernel/linux/linux-qoriq_6.12.bb b/recipes-kernel/linux/linux-qoriq_6.12.bb
index b43fe7d53..aa7561e3e 100644
--- a/recipes-kernel/linux/linux-qoriq_6.12.bb
+++ b/recipes-kernel/linux/linux-qoriq_6.12.bb
@@ -1,9 +1,9 @@
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION = "6.12.20"
+LINUX_VERSION = "6.12.49"
 
 LINUX_QORIQ_BRANCH ?= "lf-6.12.y"
 LINUX_QORIQ_SRC ?= "git://github.com/nxp-qoriq/linux.git;protocol=https"
 SRC_URI = "${LINUX_QORIQ_SRC};branch=${LINUX_QORIQ_BRANCH}"
-SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
+SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
 
 require linux-qoriq.inc
diff --git a/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch b/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch
deleted file mode 100644
index 2b4ca0e9b..000000000
--- a/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 24a58d70cbb3997e471366bd5afe54be9007bfb1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 10 Nov 2020 15:32:14 +0000
-Subject: [PATCH] libavutil: include assembly with full path from source root
-
-Otherwise nasm writes the full host-specific paths into .o
-output, which breaks binary reproducibility.
-
-Upstream-Status: Submitted [by email to jamrial@gmail.com,ffmpeg-devel@ffmpeg.org]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- libavutil/x86/cpuid.asm      | 2 +-
- libavutil/x86/emms.asm       | 2 +-
- libavutil/x86/fixed_dsp.asm  | 2 +-
- libavutil/x86/float_dsp.asm  | 2 +-
- libavutil/x86/lls.asm        | 2 +-
- libavutil/x86/pixelutils.asm | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
-index c3f7866..766f77f 100644
---- a/libavutil/x86/cpuid.asm
-+++ b/libavutil/x86/cpuid.asm
-@@ -21,7 +21,7 @@
- ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- ;******************************************************************************
- 
--%include "x86util.asm"
-+%include "libavutil/x86/x86util.asm"
- 
- SECTION .text
- 
-diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
-index 8611762..df84f22 100644
---- a/libavutil/x86/emms.asm
-+++ b/libavutil/x86/emms.asm
-@@ -18,7 +18,7 @@
- ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- ;******************************************************************************
- 
--%include "x86util.asm"
-+%include "libavutil/x86/x86util.asm"
- 
- SECTION .text
- 
-diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm
-index 979dd5c..2f41185 100644
---- a/libavutil/x86/fixed_dsp.asm
-+++ b/libavutil/x86/fixed_dsp.asm
-@@ -20,7 +20,7 @@
- ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- ;******************************************************************************
- 
--%include "x86util.asm"
-+%include "libavutil/x86/x86util.asm"
- 
- SECTION .text
- 
-diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
-index 517fd63..b773e61 100644
---- a/libavutil/x86/float_dsp.asm
-+++ b/libavutil/x86/float_dsp.asm
-@@ -20,7 +20,7 @@
- ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- ;******************************************************************************
- 
--%include "x86util.asm"
-+%include "libavutil/x86/x86util.asm"
- 
- SECTION_RODATA 32
- pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0
-diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
-index 317fba6..d2526d1 100644
---- a/libavutil/x86/lls.asm
-+++ b/libavutil/x86/lls.asm
-@@ -20,7 +20,7 @@
- ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- ;******************************************************************************
- 
--%include "x86util.asm"
-+%include "libavutil/x86/x86util.asm"
- 
- SECTION .text
- 
-diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm
-index 36c57c5..8b45ead 100644
---- a/libavutil/x86/pixelutils.asm
-+++ b/libavutil/x86/pixelutils.asm
-@@ -21,7 +21,7 @@
- ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- ;******************************************************************************
- 
--%include "x86util.asm"
-+%include "libavutil/x86/x86util.asm"
- 
- SECTION .text
- 
diff --git a/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb b/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
deleted file mode 100644
index 5b1dedcda..000000000
--- a/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
+++ /dev/null
@@ -1,185 +0,0 @@
-SUMMARY = "A complete, cross-platform solution to record, convert and stream audio and video."
-DESCRIPTION = "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, \
-               mux, demux, stream, filter and play pretty much anything that humans and machines \
-               have created. It supports the most obscure ancient formats up to the cutting edge."
-HOMEPAGE = "https://www.ffmpeg.org/"
-SECTION = "libs"
-
-LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & ISC & MIT & BSD-2-Clause & BSD-3-Clause & IJG"
-LICENSE:${PN} = "GPL-2.0-or-later"
-LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libpostproc = "GPL-2.0-or-later"
-LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
-LICENSE_FLAGS = "commercial"
-
-LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
-                    file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
-           file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
-           "
-SRC_URI[sha256sum] = "eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
-
-# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
-ARM_INSTRUCTION_SET:armv4 = "arm"
-ARM_INSTRUCTION_SET:armv5 = "arm"
-ARM_INSTRUCTION_SET:armv6 = "arm"
-
-# Should be API compatible with libav (which was a fork of ffmpeg)
-# libpostproc was previously packaged from a separate recipe
-PROVIDES = "libav libpostproc"
-
-DEPENDS = "nasm-native"
-
-inherit autotools pkgconfig
-
-PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
-                   alsa bzlib lzma pic pthreads shared theora zlib \
-                   ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
-
-# libraries to build in addition to avutil
-PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
-PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter"
-PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec"
-PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
-PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
-PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
-PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
-PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
-
-# features to support
-PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
-PACKAGECONFIG[altivec] = "--enable-altivec,--disable-altivec,"
-PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2"
-PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac"
-PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
-PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
-PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
-PACKAGECONFIG[libopus] = "--enable-libopus,--disable-libopus,libopus"
-PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
-PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz"
-PACKAGECONFIG[mfx] = "--enable-libmfx,--disable-libmfx,intel-mediasdk"
-PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
-PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
-PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2"
-PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
-PACKAGECONFIG[srt] = "--enable-libsrt,--disable-libsrt,srt"
-PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora libogg"
-PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
-PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
-PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
-PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
-PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265"
-PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb"
-PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
-PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
-
-# other configuration options
-PACKAGECONFIG[mips32r2] = ",--disable-mipsdsp --disable-mipsdspr2"
-PACKAGECONFIG[pic] = "--enable-pic"
-PACKAGECONFIG[pthreads] = "--enable-pthreads,--disable-pthreads"
-PACKAGECONFIG[shared] = "--enable-shared"
-PACKAGECONFIG[strip] = ",--disable-stripping"
-
-# Check codecs that require --enable-nonfree
-USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}"
-
-def cpu(d):
-    for arg in (d.getVar('TUNE_CCARGS') or '').split():
-        if arg.startswith('-mcpu='):
-            return arg[6:]
-    return 'generic'
-
-EXTRA_OECONF = " \
-    ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
-    \
-    --cross-prefix=${TARGET_PREFIX} \
-    \
-    --ld='${CCLD}' \
-    --cc='${CC}' \
-    --cxx='${CXX}' \
-    --arch=${TARGET_ARCH} \
-    --target-os='linux' \
-    --enable-cross-compile \
-    --extra-cflags='${CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}' \
-    --extra-ldflags='${LDFLAGS}' \
-    --sysroot='${STAGING_DIR_TARGET}' \
-    ${EXTRA_FFCONF} \
-    --libdir=${libdir} \
-    --shlibdir=${libdir} \
-    --datadir=${datadir}/ffmpeg \
-    --cpu=${@cpu(d)} \
-    --pkg-config=pkg-config \
-"
-
-EXTRA_OECONF:append:linux-gnux32 = " --disable-asm"
-
-EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}"
-EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}"
-EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r2', '--disable-mips64r6 --disable-mips32r6', '', d)}"
-EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r6', '--disable-mips64r2 --disable-mips32r2', '', d)}"
-EXTRA_OECONF:append:mips = " --extra-libs=-latomic --disable-mips32r5 --disable-mipsdsp --disable-mipsdspr2 \
-                             --disable-loongson2 --disable-loongson3 --disable-mmi --disable-msa --disable-msa2"
-EXTRA_OECONF:append:riscv32 = " --extra-libs=-latomic"
-EXTRA_OECONF:append:armv5 = " --extra-libs=-latomic"
-EXTRA_OECONF:append:powerpc = " --extra-libs=-latomic"
-
-# gold crashes on x86, another solution is to --disable-asm but thats more hacky
-# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
-
-LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-
-EXTRA_OEMAKE = "V=1"
-
-do_configure() {
-    ${S}/configure ${EXTRA_OECONF}
-}
-
-# patch out build host paths for reproducibility
-do_compile:prepend:class-target() {
-        sed -i -e "s,${WORKDIR},,g" ${B}/config.h
-}
-
-PACKAGES =+ "libavcodec \
-             libavdevice \
-             libavfilter \
-             libavformat \
-             libavresample \
-             libavutil \
-             libpostproc \
-             libswresample \
-             libswscale"
-
-FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
-FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
-FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
-FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
-FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
-FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
-FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
-FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
-FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
-
-# ffmpeg disables PIC on some platforms (e.g. x86-32)
-INSANE_SKIP:${MLPREFIX}libavcodec = "textrel"
-INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
-INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
-INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
-INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
-INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
-INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
-INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
-INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
-
-# Downgrade for NXP BSP
-DEFAULT_PREFERENCE = "-1"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb b/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb
deleted file mode 100644
index 4b61f7c04..000000000
--- a/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require optee-client.nxp.inc
-
-OPTEE_CLIENT_BRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
diff --git a/recipes-security/optee-qoriq/optee-client-qoriq_4.8.0.bb b/recipes-security/optee-qoriq/optee-client-qoriq_4.8.0.bb
new file mode 100644
index 000000000..6b1144b98
--- /dev/null
+++ b/recipes-security/optee-qoriq/optee-client-qoriq_4.8.0.bb
@@ -0,0 +1,4 @@
+require optee-client.nxp.inc
+
+OPTEE_CLIENT_BRANCH = "lf-6.12.49_2.2.0"
+SRCREV = "7443d47f9468a38721cec802bed5ba4222690697"
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.6.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
index e7847b81e..491817ef1 100644
--- a/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.6.0.bb
+++ b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "https://www.op-tee.org/"
 
 DEPENDS += "python3-pycryptodome-native"
 
-OPTEE_OS_BRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
+OPTEE_OS_BRANCH = "lf-6.12.49_2.2.0"
+SRCREV = "b3883a773a9d15ec6439f9229e48f540c37e0d00"
 
 do_install() {
     #install TA devkit
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq_4.6.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
index cd568b3dc..3241ab8c4 100644
--- a/recipes-security/optee-qoriq/optee-os-qoriq_4.6.0.bb
+++ b/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
@@ -1,7 +1,7 @@
 require optee-os.nxp.inc
 
-OPTEE_OS_BRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
+OPTEE_OS_BRANCH = "lf-6.12.49_2.2.0"
+SRCREV = "b3883a773a9d15ec6439f9229e48f540c37e0d00"
 
 do_install:append () {
         install -d ${D}${nonarch_base_libdir}/firmware/
diff --git a/recipes-security/optee-qoriq/optee-os.nxp.inc b/recipes-security/optee-qoriq/optee-os.nxp.inc
index 88ba3fbe2..1a837d54a 100644
--- a/recipes-security/optee-qoriq/optee-os.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-os.nxp.inc
@@ -1,4 +1,4 @@
-# Copyright 2020-2021,2025 NXP
+# Copyright 2020-2021,2025-2026 NXP
 require recipes-security/optee-imx/optee-os-fslc.inc
 
 DEPENDS:append = " dtc-native"
@@ -9,7 +9,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-os:"
 
 SRC_URI:remove = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_OS_SRC};branch=${OPTEE_OS_BRANCH} "
-SRC_URI:append = " file://0007-allow-setting-sysroot-for-clang.patch"
 
 OPTEE_OS_SRC ?= "git://github.com/nxp-qoriq/optee_os.git;protocol=https"
 
diff --git a/recipes-security/optee-qoriq/optee-test-qoriq_4.6.0.bb b/recipes-security/optee-qoriq/optee-test-qoriq_4.8.0.bb
index d008a6211..698c5dc85 100644
--- a/recipes-security/optee-qoriq/optee-test-qoriq_4.6.0.bb
+++ b/recipes-security/optee-qoriq/optee-test-qoriq_4.8.0.bb
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
                     file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
                     file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
 
-OPTEE_TEST_BRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "010f088f05b5ebf392c6e235d6e53d391755722f"
+OPTEE_TEST_BRANCH = "lf-6.12.49_2.2.0"
+SRCREV = "3e16153533f8d87939beb3fa130c87746d08ef1d"
diff --git a/recipes-security/optee-qoriq/optee-test.nxp.inc b/recipes-security/optee-qoriq/optee-test.nxp.inc
index 48d5a4211..6bf158d12 100644
--- a/recipes-security/optee-qoriq/optee-test.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-test.nxp.inc
@@ -1,4 +1,4 @@
-# Copyright 2020-2021,2025 NXP
+# Copyright 2020-2021,2025-2026 NXP
 require recipes-security/optee-imx/optee-test-fslc.inc
 
 DEPENDS:remove = "optee-client optee-os-tadevkit"
@@ -10,6 +10,4 @@ SRC_URI:prepend = "${OPTEE_TEST_SRC};branch=${OPTEE_TEST_BRANCH} "
 
 OPTEE_TEST_SRC ?= "git://github.com/nxp-qoriq/optee_test.git;protocol=https"
 
-CFLAGS += " -Wno-error=unterminated-string-initialization"
-
 COMPATIBLE_MACHINE = "(qoriq-arm64)"