88 files changed, 676 insertions, 360 deletions
diff --git a/EULA b/EULA
index c0273f8e..ac7337fa 100644
--- a/EULA
+++ b/EULA
@@ -1,4 +1,4 @@
-LA_OPT_NXP_Software_License v56 April 2024
+LA_OPT_NXP_Software_License v57 July 2024
 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
@@ -767,3 +767,9 @@ upon notice.
 Vivante: Distribution of Vivante software must be a part of, or embedded
 within, Authorized Systems that include a Vivante Graphics Processing Unit.
+Wittenstein:  Your use of the SafeRTOS v9.x and Networking Stack, in object
+form, is limited to your internal testing, evaluation, feedback and development
+specifically for use with an NXP Product.  Licensee’s license to use and
+supply the software to you expires on June 25, 2026.  Further rights must be
+obtained directly from Wittenstein.
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 86338259..c170d2e0 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -60,6 +60,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48 = "db4762b09b6bda63da103963
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49 = "2827219e81f28aba7c6a569f7c437fa7"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53 = "44a8052c384584ba09077e85a3d1654f"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56 = "10c0fda810c63b052409b15a5445671a"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57 = "ca53281cc0caa7e320d4945a896fb837"
 FSL_EULA_FILE_MD5SUMS = " \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
@@ -116,11 +117,12 @@ FSL_EULA_FILE_MD5SUMS = " \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56} \
+    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57} \
 "
 # The checksum for the EULA in the layer
 FSL_EULA_FILE_MD5SUM ?= \
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56}"
+    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57}"
 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/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index f07580dd..3a454ce1 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -23,6 +23,7 @@ SECO_FIRMWARE_NAME:mx8dx-generic-bsp  ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-contain
 SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxl${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx93-generic-bsp   ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95${IMX_SOC_REV_LOWER}-ahab-container.img"
 python () {
    if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
diff --git a/conf/layer.conf b/conf/layer.conf
index aa29dbe0..2376cbad 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 = "styhead"
+LAYERSERIES_COMPAT_freescale-layer = "styhead walnascar"
 LAYERDEPENDS_freescale-layer = "core"
 # Add the Freescale-specific licenses into the metadata
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index f8bdc4d7..001ce97a 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -13,11 +13,11 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
    freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-i2c-spi-slave.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-iw612-otbr.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-ld.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
    freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf
new file mode 100644
index 00000000..d03d6913
--- /dev/null
+++ b/conf/machine/imx95-19x19-verdin.conf
@@ -0,0 +1,72 @@
+#@TYPE: Machine
+#@NAME: Toradex i.MX 95 19x19 Verdin Evaluation Kit
+#@SOC: i.MX95
+#@DESCRIPTION: Machine configuration for Toradex i.MX 95 19x19 Verdin Evaluation Ki
+#@MAINTAINER: Flora Hu <flora.hu@nxp.com>
+MACHINEOVERRIDES =. "mx95:"
+require conf/machine/include/imx95-evk.inc
+IMX_DEFAULT_BSP = "nxp"
+KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin"
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-isp-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10-isp-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-isp-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-lvds.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtbo \
+"
+UBOOT_CONFIG_BASENAME = "imx95_19x19_verdin"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd]    = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[fspi]  = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
+IMXBOOT_TARGETS = "flash_a55"
+OEI_BOARD  = "mx95lp5"
+DDR_TYPE   = "lpddr5"
+DDR_FIRMWARE_NAME = " \
+    lpddr5_dmem_v202311.bin \
+    lpddr5_dmem_qb_v202311.bin \
+    lpddr5_imem_v202311.bin \
+    lpddr5_imem_qb_v202311.bin \
+"
+IMXBOOT_VARIANT = ""
+# The System Manager Firmware Name corresponds to a particular binary implementation
+# in the Yocto deploy folder. The name is comprised of the Firmware Basename and the
+# default system manager Config name, e.g., m33_image-mx95evk.bin and
+# m33_image-mx95evk_fusa.bin for the standard BSP version and FuSa version, respectively
+# The System Manager Firmware Basename is an alias used by imx-boot instead of using
+# a unique name for each implementation, e.g., m33_image.bin for i.MX 95
+SYSTEM_MANAGER_FIRMWARE_BASENAME ?= "m33_image"
+SYSTEM_MANAGER_FIRMWARE_NAME     ?= "m33_image-mx95evk"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b127cee4..baca3fc4 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -166,6 +166,7 @@ DEFAULTTUNE:mx8qm-generic-bsp  ?= "cortexa72-cortexa53-crypto"
 DEFAULTTUNE:mx8x-generic-bsp   ?= "cortexa35-crypto"
 DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto"
 DEFAULTTUNE:mx93-generic-bsp   ?= "cortexa55"
+DEFAULTTUNE:mx95-generic-bsp   ?= "cortexa55"
 INHERIT += "machine-overrides-extender"
@@ -221,6 +222,7 @@ MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxf
 MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-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:mx95:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp"
 #######
 ### Mainline BSP specific overrides
@@ -264,6 +266,7 @@ MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainlin
 MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-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: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 = " \
    mx6 \
@@ -295,6 +298,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
    mx8dxl \
    mx8ulp \
    mx93 \
+    mx95 \
 "
 MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR = "%s overrides cannot be used and need conversion to use the new BSP-specific overrides. Check 'meta-freescale/scripts/convert-bsp-specific-overrides'."
@@ -323,6 +327,7 @@ MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp   = "-mx8"
 MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp  = "-mx8xl"
 MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp  = "-mx8ulp"
 MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp    = "-mx93"
+MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp    = "-mx95"
 # For Mainline we use a single SoC suffix as we don't have different build options
 MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx"
@@ -400,6 +405,8 @@ IMX_EXTRA_FIRMWARE:mx8m-generic-bsp   = "imx-boot-firmware-files"
 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:mx93-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
+PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager"
+IMX_EXTRA_FIRMWARE:mx95-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager imx-oei"
 # Firmware
 MACHINE_FIRMWARE ?= ""
@@ -420,6 +427,7 @@ MACHINE_FIRMWARE:append:mx8mp-generic-bsp    = " linux-firmware-imx-sdma-imx7d f
 MACHINE_FIRMWARE:append:mx8mq-generic-bsp    = " linux-firmware-imx-sdma-imx7d"
 MACHINE_FIRMWARE:append:mx8qxp-generic-bsp   = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
 MACHINE_FIRMWARE:append:mx8dx-generic-bsp    = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
+MACHINE_FIRMWARE:append:mx95-generic-bsp     = " firmware-imx-vpu-wave"
 MACHINE_FIRMWARE:append:imx-mainline-bsp     = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
@@ -566,6 +574,16 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu     ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-icd-loader:imxgpu  ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/egl:mx95-nxp-bsp        ?= "mali-imx"
+PREFERRED_PROVIDER_virtual/libgles1:mx95-nxp-bsp   ?= "mali-imx"
+PREFERRED_PROVIDER_virtual/libgles2:mx95-nxp-bsp   ?= "mali-imx"
+PREFERRED_PROVIDER_virtual/libgles3:mx95-nxp-bsp   ?= "mali-imx"
+PREFERRED_PROVIDER_opencl-clhpp:mx95-nxp-bsp       ?= "opencl-clhpp"
+PREFERRED_PROVIDER_opencl-headers:mx95-nxp-bsp     ?= "opencl-headers"
+# install libmali-opencl-icd package as the loaders backend
+PREFERRED_PROVIDER_opencl-icd-loader:mx95-nxp-bsp  ?= "opencl-icd-loader"
+PREFERRED_PROVIDER_virtual/opencl-icd:mx95-nxp-bsp ?= "opencl-icd-loader"
 PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "12.0.4.imx"
 # i.MX 6 & 7 stay on weston 10.0 for fbdev
 PREFERRED_VERSION_weston:mx6-nxp-bsp      ??= "10.0.5.imx"
@@ -579,12 +597,12 @@ PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
 # Use i.MX libdrm Version
 PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx"
-PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.261.1.imx"
+PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.275.0.imx"
-PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.261.1.imx"
+PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.275.0.imx"
-PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.261.1.imx"
+PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.275.0.imx"
-PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.261.1.imx"
+PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.275.0.imx"
-PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.261.1.imx"
+PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.275.0.imx"
-PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx"
+PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "4.2.0.imx"
diff --git a/conf/machine/include/imx95-evk.inc b/conf/machine/include/imx95-evk.inc
new file mode 100644
index 00000000..1a2d9f8a
--- /dev/null
+++ b/conf/machine/include/imx95-evk.inc
@@ -0,0 +1,56 @@
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
+MACHINE_FEATURES += "pci wifi bluetooth optee"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-pcie nxpwifi-all-sdio jailhouse dpdk xen"
+KERNEL_DEVICETREE = " \
+    freescale/${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 ??= "sd"
+UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_evk_defconfig,sdcard"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_evk_fspi_defconfig"
+ATF_PLATFORM = "imx95"
+OEI_CONFIGS = "ddr tcm"
+OEI_CORE   = "m33"
+OEI_SOC    = "mx95"
+OEI_BOARD  ?= "mx95lp5"
+DDR_TYPE   ?= "lpddr5"
+IMXBOOT_VARIANTS = "alt jailhouse netc"
+# 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', \
+                                                                              'mx95evk', 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', \
+                                                                           '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d)} \
+"
+IMXBOOT_TARGETS = " \
+    ${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_a55_flexspi', '${IMXBOOT_TARGETS_SD}', d)} \
+"
+IMX_BOOT_SOC_TARGET = "iMX95"
+IMX_BOOT_SEEK = "32"
+# We have to disable SERIAL_CONSOLE due to auto-serial-console
+SERIAL_CONSOLES = "115200;ttyLP0"
+IMX_DEFAULT_BSP = "nxp"
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
new file mode 100644
index 00000000..d8033622
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -0,0 +1,44 @@
+# Set generic compiler for system manager core
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "${SM_COMPILER}"
+SM_COMPILER ?= "gcc-arm-none-eabi-native"
+PROVIDES += "virtual/imx-system-manager"
+inherit deploy
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Set monitor mode for none, one, or two
+PACKAGECONFIG[m0] = "M=0,,,,,m1 m2"
+PACKAGECONFIG[m1] = ",,,,,m0 m2"
+PACKAGECONFIG[m2] = "M=2,,,,,m0 m1"
+SYSTEM_MANAGER_CONFIG ?= "INVALID"
+LDFLAGS[unexport] = "1"
+EXTRA_OEMAKE = " \
+    V=y \
+    SM_CROSS_COMPILE=arm-none-eabi- \
+    ${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}
+}
+do_install[noexec] = "1"
+addtask deploy after do_compile
+do_deploy() {
+    install -D -p -m 0644 \
+        ${B}/build/${SYSTEM_MANAGER_CONFIG}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
+        ${DEPLOYDIR}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}.bin
+}
+COMPATIBLE_MACHINE = "(mx95-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_1.0.0.bb
new file mode 100644
index 00000000..eceaaa67
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "i.MX System Manager Firmware"
+DESCRIPTION = "\
+The System Manager (SM) is a firmware that runs on a Cortex-M processor on \
+many NXP i.MX processors. The Cortex-M is the boot core, runs the boot ROM \
+which loads the SM (and other boot code), and then branches to the SM. The \
+SM then configures some aspects of the hardware such as isolation mechanisms \
+and then starts other cores in the system. After starting these cores, it \
+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"
+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"
+S = "${WORKDIR}/git"
+require imx-system-manager.inc
+PACKAGECONFIG ??= "m2"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
deleted file mode 100644
index b77fbc83..00000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-DEPENDS:append:imxvpu = " imx-vpuwrap"
-# Additional imx code and patches are included in the chromium-imx git repository.
-# The code below fetches this repository, copies the extra source over to the main
-# chromium source directory, and applies the patches.
-CHROMIUM_IMX_BRANCH ?= "master"
-CHROMIUM_IMX_SRCREV ?= "HEAD"
-CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git"
-PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches"
-CHROMIUM_IMX_COMMON_PATCHES ?= " "
-CHROMIUM_IMX_VPU_PATCHES ?= " "
-CHROMIUM_IMX_WAYLAND_PATCHES ?= " "
-SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https"
-do_unpack[postfuncs] += "copy_chromium_imx_files"
-# using =+ instead of += to make sure add_chromium_imx_patches is
-# executed before add_ozone_wayland_patches in the main recipe;
-# this is necessary because add_chromium_imx_patches appends
-# patches to the OZONE_WAYLAND_EXTRA_PATCHES variable
-do_patch[prefuncs] =+ "add_chromium_imx_patches"
-# * Lost context problems are not known to happen with Vivante GPUs,
-#   so it is safe to use ignore-lost-context
-# * Proprietary codecs need to be enabled for h.264 and MP4 support
-PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs"
-copy_chromium_imx_files() {
-        # sources in src/ are already organized in a manner
-        # that matches the subdirectories in the chromium
-        # source directory; just copy over the files in src/
-        cp -r ${WORKDIR}/chromium-imx-git/src/* ${S}/
-}
-python add_chromium_imx_patches() {
-    d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_COMMON_PATCHES', 1))
-    d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_VPU_PATCHES', 1))
-    d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1))
-}
-COMPATIBLE_MACHINE = "(mx6-nxp-bsp)"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
deleted file mode 100644
index 23a8fff9..00000000
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream-Status: Pending
-diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h
--- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 2016-05-27 11:45:31.248306710 -0500
-+++ chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h     2016-05-27 11:49:53.000000000 -0500
-@@ -36,7 +36,7 @@
- extern "C" {
- #endif
- 
-#include <va/va.h>
-+#include <libva/va/va.h>
- 
- /**
-  * \defgroup api_dec_jpeg JPEG decoding API
-diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h chromium-48.0.2548.0/third_party/libva/va/va.h
--- chromium-48.0.2548.0_org/third_party/libva/va/va.h  2016-05-27 11:45:31.248306710 -0500
-+++ chromium-48.0.2548.0/third_party/libva/va/va.h      2016-05-27 11:49:16.000000000 -0500
-@@ -80,7 +80,7 @@
- 
- #include <stddef.h>
- #include <stdint.h>
-#include <va/va_version.h>
-+#include <libva/va/va_version.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -2836,16 +2836,16 @@
-  */
- #define VA_PICTURE_HEVC_RPS_LT_CURR             0x00000040
- 
-#include <va/va_dec_hevc.h>
-#include <va/va_dec_jpeg.h>
-#include <va/va_dec_vp8.h>
-#include <va/va_dec_vp9.h>
-#include <va/va_enc_hevc.h>
-#include <va/va_enc_h264.h>
-#include <va/va_enc_jpeg.h>
-#include <va/va_enc_mpeg2.h>
-#include <va/va_enc_vp8.h>
-#include <va/va_vpp.h>
-+#include <libva/va/va_dec_hevc.h>
-+#include <libva/va/va_dec_jpeg.h>
-+#include <libva/va/va_dec_vp8.h>
-+#include <libva/va/va_dec_vp9.h>
-+#include <libva/va/va_enc_hevc.h>
-+#include <libva/va/va_enc_h264.h>
-+#include <libva/va/va_enc_jpeg.h>
-+#include <libva/va/va_enc_mpeg2.h>
-+#include <libva/va/va_enc_vp8.h>
-+#include <libva/va/va_vpp.h>
- 
- /**@}*/
- 
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index 7d84ee93..1b527fc6 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -6,8 +6,10 @@ SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable"
 DEPENDS:append:mx95-nxp-bsp = " libdrm"
-PACKAGECONFIG:remove:mx95-nxp-bsp = "libcamera"
+PACKAGECONFIG:remove:mx6-nxp-bsp = "gstreamer"
-PACKAGECONFIG:remove:imx-nxp-bsp = "gstreamer"
+PACKAGECONFIG:remove:mx7-nxp-bsp = "gstreamer"
+PACKAGECONFIG:remove:mx8-nxp-bsp = "gstreamer"
+PACKAGECONFIG:remove:mx93-nxp-bsp = "gstreamer"
 PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}"
 # FIXME: Needs to qualify on PACKAGECONFIG
diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
index 4cfa51ea..a5d3c2e2 100644
--- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -1,4 +1,5 @@
 # Only _mx8 machine do provide virtual/libgbm required for any drm* flavour
 DRM-REMOVE:imxgpu = "drm-gl drm-gles2"
 DRM-REMOVE:imxgpu:mx8-nxp-bsp = ""
+DRM-REMOVE:imxgpu:mx95-nxp-bsp = ""
 PACKAGECONFIG:remove = "${DRM-REMOVE}"
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch
deleted file mode 100644
index 5769d555..00000000
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 018249d180705657efbecdce3736c9a415412762 Mon Sep 17 00:00:00 2001
-From: Meng Li <Meng.Li@windriver.com>
-Date: Tue, 9 Jul 2024 14:35:06 +0800
-Subject: [PATCH] FMCCFGReader: improve parameter definition of function 
- errorFuncHandler
-When building fmc package, there is below error:
-FMCCFGReader.cpp: In member function 'void CCFGReader::parseCfgData(std::string)':
-FMCCFGReader.cpp:98:40: error: invalid conversion from
-'void (*)(void*, xmlErrorPtr)' {aka 'void (*)(void*, _xmlError*)'} to
-'xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'} [-fpermissive]
-   98 |     xmlSetStructuredErrorFunc( &error, errorFuncHandler );
-      |                                        ^~~~~~~~~~~~~~~~
-      |                                        |
-      |                                        void (*)(void*, xmlErrorPtr) {aka void (*)(void*, _xmlError*)}
-Because in libxml2 package, the parameter definition of function
-pointer xmlStructuredErrorFunc has changed, adjust the parameter
-of errorFuncHandler to align with upstream.
-Upstream-Status: Pending
-Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
- source/FMCGenericError.cpp | 2 +-
- source/FMCGenericError.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/source/FMCGenericError.cpp b/source/FMCGenericError.cpp
-index a1a87a4..c11742c 100644
--- a/source/FMCGenericError.cpp
-+++ b/source/FMCGenericError.cpp
-@@ -33,7 +33,7 @@
- #include "FMCUtils.h"
- #include "logger.hpp"
- 
-void errorFuncHandler( void * ctx, xmlErrorPtr error )
-+void errorFuncHandler( void * ctx, const xmlError *error )
- {
-     char *filestr = (char*)"";
-     char *msgstr  = (char*)"";
-diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h
-index 504a81b..61ab6c1 100644
--- a/source/FMCGenericError.h
-+++ b/source/FMCGenericError.h
-@@ -35,7 +35,7 @@
- 
- const int NO_LINE = -1;
- 
-void errorFuncHandler( void * ctx, xmlErrorPtr error );
-+void errorFuncHandler( void * ctx, const xmlError *error );
- 
- 
- class CGenericError {
-- 
-2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
index 457a202c..2219a6c0 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
@@ -7,10 +7,7 @@ PR = "r2"
 DEPENDS = "libxml2 fmlib tclap"
 SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1"
-SRC_URI:append = " \
+SRCREV = "5b9f4b16a864e9dfa58cdcc860be278a7f66ac18"
-    file://0001-FMCCFGReader-improve-parameter-definition-of-functio.patch \
-"
-SRCREV = "63c8ac99899a9bcd723801579b4d786594670455"
 S = "${WORKDIR}/git"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 7401a566..e450e568 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -12,6 +12,7 @@ SRC_URI:append:imxgpu = " \
 PACKAGECONFIG_GL_IMX_GPU     = ""
 PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms"
+PACKAGECONFIG_GL_IMX_GPU:mx95-nxp-bsp = "gbm kms"
 PACKAGECONFIG_GL:imxpxp   = "gles2"
 PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
@@ -31,6 +32,7 @@ PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}"
 PACKAGECONFIG_VULKAN_IMX_GPU       = ""
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp   = "vulkan"
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
 PACKAGECONFIG_VULKAN               = ""
 PACKAGECONFIG_VULKAN:imxgpu        = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
index a97b765f..659a7cc0 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -6,3 +6,4 @@ PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx"
 # i.MX8 does never provide native x11, so required dependencies are not met
 PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx95-nxp-bsp = "xcomposite-egl xcomposite-glx"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
index 1c51fc09..b1249966 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
@@ -14,6 +14,8 @@ PACKAGECONFIG_GRAPHICS:imxgpu3d = " \
 PACKAGECONFIG_GRAPHICS_IMX_GPU = ""
 PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \
    gbm kms"
+PACKAGECONFIG_GRAPHICS_IMX_GPU:mx95-nxp-bsp = " \
+    gbm kms"
 PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \
    gles2 gbm kms"
@@ -51,4 +53,5 @@ PACKAGECONFIG_VULKAN:imxgpu = " \
    ${PACKAGECONFIG_VULKAN_IMX_GPU}"
 PACKAGECONFIG_VULKAN_IMX_GPU               = ""
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx95-nxp-bsp   = "vulkan"
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
index ca011758..f2b0b802 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend
@@ -4,3 +4,4 @@ PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx"
 PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx"
 PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx"
 PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx95-nxp-bsp = "xcomposite-egl xcomposite-glx"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb
index f97d21ad..ea79fed3 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb
@@ -1,27 +1,26 @@
-# Copyright 2021-2023 NXP
+# Copyright 2021-2024 NXP
 SUMMARY = "NXP i.MX ELE firmware"
-DESCRIPTION = "EdgeLock Enclave firmware for i.MX series SoCs"
+DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "4ed450a"
+IMX_SRCREV_ABBREV = "4b30ee5"
-SRC_URI[md5sum] = "1359bc7d378bddfe1d8479eba05b05ec"
+SRC_URI[sha256sum] = "fdc9f7571e6cf95e6cd7ee1abb4cb728359e2e9b7e99695d39860034c5ea0ada"
-SRC_URI[sha256sum] = "d858fcbb47482a898a1af5fe5f3f8be53bb21fac793b33e9bcdfd2b4dda79d3c"
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 do_compile[noexec] = "1"
 do_install() {
-   install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
-   install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
+    if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
-       install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+        install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   fi
+    fi
 }
 do_deploy () {
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.24.inc b/recipes-bsp/firmware-imx/firmware-imx-8.25.inc
index 9e9d10dc..532f4340 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.24.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.25.inc
@@ -1,16 +1,15 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 # Note: This .inc file is used from differently named recipes, so the package
 # name must be hard-coded, i.e., ${BPN} cannot be used.
 SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "fbe0a4c"
+IMX_SRCREV_ABBREV = "27879f8"
-SRC_URI[md5sum] = "440b125e897614d77fac663d90bcffc8"
+SRC_URI[sha256sum] = "55766dad38961fde3ed3224ee6a46ab1c5aea62a5b947530228d8fbc4a7d2816"
-SRC_URI[sha256sum] = "2e27962332197ebebbb30138f6dfb365361d48d7efa565df97c4f79285b1ca50"
 S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.24.bb b/recipes-bsp/firmware-imx/firmware-imx_8.25.bb
index 489174d0..a4e17c99 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.24.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.25.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2021,2023 NXP
+# Copyright 2017-2021,2024 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SUMMARY = "Freescale i.MX firmware"
 DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.24.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb
index 24619859..c35e31e0 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.24.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 NXP
+# Copyright (C) 2018-2024 NXP
 SUMMARY = "Freescale i.MX Firmware files used for boot"
 require firmware-imx-${PV}.inc
diff --git a/recipes-bsp/imx-atf/imx-atf_2.10.bb b/recipes-bsp/imx-atf/imx-atf_2.10.bb
index 14ed1252..04826b4c 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.10.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.10.bb
@@ -9,7 +9,7 @@ PV .= "+git${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf_v2.10"
-SRCREV = "49143a1701d9ccd3239e3f95f3042897ca889ea8"
+SRCREV = "28affcae957cb8194917b5246276630f9e6343e1"
 S = "${WORKDIR}/git"
@@ -48,7 +48,9 @@ def remove_options_tail (in_string):
    from itertools import takewhile
    return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' ')))
-EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}.bfd"'
+# LD can have linker suffix in its name e.g. aarch64-yoe-linux-ld.lld so we need to
+# drop .lld as well along with options from LD
+EXTRA_OEMAKE += 'LD="${HOST_PREFIX}ld.bfd"'
 EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"'
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 9c9db88b..348d717a 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -13,7 +13,7 @@ PE = "1"
 PV = "5.9+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
 SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 3c027044..63857fa6 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -104,7 +104,9 @@ compile_mx8m() {
        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \
                                                             ${BOOT_STAGING}
    fi
-    ln -sf ${UBOOT_DTB_NAME_EXTRA}                           ${BOOT_STAGING}/${UBOOT_DTB_NAME}
+    if [ "${UBOOT_DTB_NAME_EXTRA}" != "${UBOOT_DTB_NAME}" ] ; then
+        ln -sf ${UBOOT_DTB_NAME_EXTRA}                       ${BOOT_STAGING}/${UBOOT_DTB_NAME}
+    fi
    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
                                                             ${BOOT_STAGING}/u-boot-nodtb.bin
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 9b03d392..8617ca36 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -5,8 +5,8 @@ DEPENDS = "zlib-native openssl-native"
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
           file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
-SRCREV = "ca5d6b2d3fd9ab15825b97f7ef6f1ce9a8644966"
+SRCREV = "4622115cbc037f79039c4522faeced4aabea986b"
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
index 4723146e..5b04b1e2 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
@@ -61,7 +61,9 @@ PACKAGECONFIG:append:imxpxp           = " pxp"
 # former is not available pre-5.6. Out of the dma-heaps, we
 # pick the uncached one by default (see above).
 PACKAGECONFIG:append:mx8-nxp-bsp      = " dma-heap-uncached"
-PACKAGECONFIG:append:mx8m-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mq-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mm-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mp-nxp-bsp     = " dwl"
 HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2"
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index 568096c4..69630720 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "dtc-native"
 inherit deploy
 SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1"
-SRCREV = "8efeeac253ff780cbf1382ff40e09436d65e220d"
+SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc"
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 5721313b..a4ad982b 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "tcl-native"
 inherit deploy siteinfo
 SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1"
-SRCREV = "020dcf0645959afec6705f518e8350476891ef4f"
+SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4"
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
index 5d49a830..0c3f8504 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a
 SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf_v2024.04"
-LOCALVERSION ?= "-imx_v2024.04_6.6.23-2.0.0"
+LOCALVERSION ?= "-imx_v2024.04_6.6.36-2.1.0"
-SRCREV = "674440bc73e1dd483b84269cccfad89ab40af424"
+SRCREV = "de16f4f17221b2ff72b8cb18c28cd8a29f3c2710"
 DEPENDS += " \
    bc-native \
diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index b001a325..268b5b1d 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315"
 inherit deploy
 SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https"
-SRCREV = "15deb924ff063007592ee647602dd454353f5aee"
+SRCREV = "55789d536850e00c6f2284fb28eaf21712cd276b"
 S = "${WORKDIR}/git"
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
index 945f0879..598a8fc2 100644
--- a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
@@ -4,11 +4,12 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
-SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb"
+SRCREV = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
index 69042882..05c6de1b 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
@@ -7,11 +7,12 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0"
+SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
index 01eb14b9..aacec8ca 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
-SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50"
+SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40"
 S = "${WORKDIR}/git"
@@ -21,7 +21,8 @@ FILES:${PN} += "${datadir}/vulkan"
 RDEPENDS:${PN} += "python3-core"
 # These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
index 01cbeafa..7caed672 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https"
-SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0"
+SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229"
 S = "${WORKDIR}/git"
@@ -36,7 +36,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
 RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
 # These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
index 7a7edc9e..f86912c9 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
-SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1"
+SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664"
 S = "${WORKDIR}/git"
@@ -15,7 +15,7 @@ inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
 REQUIRED_DISTRO_FEATURES = "vulkan"
-DEPENDS += "vulkan-headers vulkan-loader"
+DEPENDS += "vulkan-headers vulkan-loader vulkan-volk"
 EXTRA_OECMAKE = "\
                 -DBUILD_TESTS=OFF \
@@ -31,6 +31,7 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
index 1e2a0ace..23958910 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
@@ -8,14 +8,14 @@ SECTION = "libs"
 LICENSE = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
-SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https"
-SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6"
+SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2"
 S = "${WORKDIR}/git"
 REQUIRED_DISTRO_FEATURES = "vulkan"
-DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang"
+DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
 # BUILD_TESTS            - Not required for OE builds
 # USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
@@ -42,7 +42,8 @@ FILES_SOLIBSDEV = ""
 # These recipes need to be updated in lockstep with each other:
 # glslang, vulkan-headers, vulkan-loader, vulkan-tools,
-# vulkan-validation-layers, spirv-headers, spirv-tools
+# vulkan-validation-layers, spirv-headers, spirv-tools,
+# vulkan-utility-libraries.
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
index 303aa8ff..befc769e 100644
--- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
+++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
@@ -3,8 +3,8 @@ on an AIOP Tile using MC interfaces. This application enables the user to \
 fetch status of tile, load a valid ELF file and run it on a tile and get and set \
 time of day."
 SECTION = "dpaa2"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \
    file://0001-remove-libio.h.patch \
diff --git a/recipes-dpaa2/management-complex/management-complex_10.37.0.bb b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
index d1877159..5097e71f 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.37.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
@@ -1,17 +1,18 @@
 SUMMARY = "DPAA2 Management Complex Firmware"
 LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=481d6288552113961a835bbabceb0c33"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0701845051a61f6012009d7d6d11b32b"
 inherit deploy
 INHIBIT_DEFAULT_DEPS = "1"
 SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;nobranch=1"
-SRCREV = "bb19f586b87b97878b4bd0d3e57da2ca40c5c69f"
+SRCREV = "7d82686272f8a60b803818bbc7c5396819ee3b06"
 S = "${WORKDIR}/git"
 REGLEX:ls2088a = "ls2088a"
+REGLEX:ls2080a = "ls2080a"
 REGLEX:ls1088a = "ls1088a"
 REGLEX:lx2160a = "lx216xa"
 REGLEX:lx2162a = "lx216xa"
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index 1d1aeffe..bbf7fec2 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -1,11 +1,11 @@
 SUMMARY = "DPAA2 Resource Manager Tool"
 LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ec8d84e9cd4de287e290275d09db27f0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
 SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \
    file://disable-manpage-generation.patch \
 "
-SRCREV = "46604e41f4c7e54efa62503c6b4629321b21e056"
+SRCREV = "d9fbfc68018c8dbe33bdf236dc6b4c02f15aa6e1"
 S = "${WORKDIR}/git"
diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb
index 2c695368..c54484be 100644
--- a/recipes-dpaa2/spc/spc_git.bb
+++ b/recipes-dpaa2/spc/spc_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=163b09a1c249a6ff2b28da1ceca2e0a8"
 DEPENDS = "libxml2 fmlib tclap"
 SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1"
-SRCREV = "d624b7809be48e4cf29a7bfa201028e4de1d1955"
+SRCREV = "b8d69580e5c6aeeb9f1354ee2faed6e0134eaef4"
 S = "${WORKDIR}/git"
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index e4c34d7c..aedd01ac 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 PROVIDES = "jailhouse"
 RPROVIDES:${PN} += "jailhouse"
-SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
-SRCREV = "ce11ba42dfa34f96aca76016a51d21e5d2539001"
+SRCREV = "327e56941e3e96ef9a291d2decb7add21078d8de"
 IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
 SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index 731b7a23..ca9f87ee 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "PKCS library"
-LICENSE = "GPL-2.0-only & BSD"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625"
 SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \
diff --git a/recipes-extended/secure-obj/secure-obj-module_git.bb b/recipes-extended/secure-obj/secure-obj-module_git.bb
index 3866dde4..1e5709b6 100644
--- a/recipes-extended/secure-obj/secure-obj-module_git.bb
+++ b/recipes-extended/secure-obj/secure-obj-module_git.bb
@@ -1,6 +1,6 @@
 require secure-obj.inc
-LIC_FILES_CHKSUM = "file://../README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS += "virtual/kernel"
diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc
index 64e4a6b7..16115ff0 100644
--- a/recipes-extended/secure-obj/secure-obj.inc
+++ b/recipes-extended/secure-obj/secure-obj.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Secure Object"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 DEPENDS = "openssl optee-os-qoriq optee-client-qoriq"
 RDEPENDS:${PN} = "bash libcrypto libssl"
@@ -11,7 +11,7 @@ inherit python3native
 LDFLAGS += "${TOOLCHAIN_OPTIONS}"
 SRC_URI = "git://github.com/nxp-qoriq/secure_obj;protocol=https;nobranch=1"
-SRCREV = "5ff1231f74b4b01744be95a3137a14ad0a483e61"
+SRCREV = "4706a6534ec09f9a46bfe305c5e49badca32b4c6"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/"
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 84ecea1e..64f59f47 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -1,9 +1,11 @@
 require secure-obj.inc
-LIC_FILES_CHKSUM = "file://README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 S = "${WORKDIR}/git"
+DEPENDS:remove = " python3-pycryptodomex-native"
+DEPENDS:append = " python3-cryptography-native optee-os-qoriq-tadevkit"
 RDEPENDS:{PN}  += "secure-obj-module"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
@@ -17,14 +19,15 @@ CFLAGS += "${TOOLCHAIN_OPTIONS}"
 do_compile() {
        unset LDFLAGS
-        export TA_DEV_KIT_DIR="${RECIPE_SYSROOT}/usr/include/optee/export-user_ta"
+        export TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta/
        export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr" 
+        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr"
-        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do        
+        export OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules
+        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do
            cd  ${APP}
            oe_runmake
            cd ..
-        done       
+        done
 }
 do_install() {
diff --git a/recipes-fsl/mcore-demos/README b/recipes-fsl/mcore-demos/README
index 0c994487..0023bb26 100644
--- a/recipes-fsl/mcore-demos/README
+++ b/recipes-fsl/mcore-demos/README
@@ -4,7 +4,8 @@ The M4 demo app version of each SoCs are followed:
 * 1.0.1 -- i.MX 7D
 The M7 demo app version of each SoCs are followed:
-* 2.16.000 --  i.MX 8MP , 8MNULite, 8MN, i.MX95
+* 2.16.000 --  i.MX 8MP , 8MNULite, 8MN
+* 2.16.001 --  i.MX95
 The M33 demo app version of each SoCs are followed:
 * 2.16.000 --  i.MX 8ULP, i.MX 93
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.001.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.001.bb
new file mode 100644
index 00000000..e2030306
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.001.bb
@@ -0,0 +1,11 @@
+# Copyright 2023-2024 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=ca53281cc0caa7e320d4945a896fb837"
+SRC_URI[imx95.md5sum] = "70f4a0ab4f65beef113dd544c4b3be8c"
+SRC_URI[imx95.sha256sum] = "0569f128e2068c509dcd4afe6689a62cdb5a4ac9f8eb1b522b2bfaac0e7d09fd"
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
index 23168ae1..5e8f5402 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
 DEPENDS = "libdrm ${LIBGAL_IMX}"
 LIBGAL_IMX              = "libgal-imx"
@@ -15,15 +15,13 @@ PROVIDES += "virtual/libg2d"
 SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
 IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
-IMX_SRCREV_ABBREV = "6a00326"
+IMX_SRCREV_ABBREV = "7943590"
 IMX_SRC_URI_NAME = "v1"
-SRC_URI[v1.md5sum] = "470ad0bdef7dec171395991d47b39e2c"
+SRC_URI[v1.sha256sum] = "bf347f53e8f390a0554c0db76707819bb50cf4aaa564a9c86821ae9add26e113"
-SRC_URI[v1.sha256sum] = "4d8e4b536bd24eedfbce375a06c19ab74603291b8b5a5be36b03fbf6e016e940"
-IMX_SRCREV_ABBREV:mx95-nxp-bsp = "6a00326"
+IMX_SRCREV_ABBREV:mx95-nxp-bsp = "7943590"
 IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
-SRC_URI[v2.md5sum] = "cf807c38a110763c19a12d6d595b4b09"
+SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076"
-SRC_URI[v2.sha256sum] = "1b86d4fecd5026e871da0de8ed6382c962460468d8151ae2f95b72d00bca17ee"
 S = "${WORKDIR}/${IMX_BIN_NAME}"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 0f0c1896..ab0819c6 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 DEPENDS = "cairo"
-PV = "2.1+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
 GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
-SRCBRANCH = "imx_2.1"
+SRCBRANCH = "imx_2.2"
 SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d"
 S = "${WORKDIR}/git"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
index d12d9c1a..7ce542d0 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
@@ -5,17 +5,15 @@
 DESCRIPTION = "G2D library using i.MX GPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
 DEPENDS = "libgal-imx"
 PROVIDES = "virtual/libg2d"
 SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
 IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
-IMX_SRCREV_ABBREV = "bc7b6a2"
+IMX_SRCREV_ABBREV = "95408a4"
-SRC_URI[aarch64.md5sum] = "4b12d0434d612b57ff4d7df690c3154f"
+SRC_URI[aarch64.sha256sum] = "48327fe6315aa739d5665004289412ff2e3a4e0084d1664f837276f09d35b032"
-SRC_URI[aarch64.sha256sum] = "b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918"
+SRC_URI[arm.sha256sum] = "f28b2cd7b29302cd654fc845a0695d6fe935e383b56556e36933488dfa014830"
-SRC_URI[arm.md5sum] = "4bead15838f47793f59cb374c10c2dd2"
-SRC_URI[arm.sha256sum] = "413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663"
 S = "${WORKDIR}/${IMX_BIN_NAME}"
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 4481188b..88fc60ae 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,19 +1,19 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
 PROVIDES += "virtual/libg2d"
-PV = "2.1.0+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
 IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
-SRCBRANCH = "imx_2.1"
+SRCBRANCH = "imx_2.2"
-SRCREV = "edd234c4e1c58cd2453963d19155d4d5d3800d07"
+SRCREV = "5e633f895a84cec809ca98d77c879af3591b3b20"
 S = "${WORKDIR}/git"
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 2d02d7ab..ee9c391f 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -63,6 +63,12 @@ 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
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
deleted file mode 100644
index db99b1c7..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-IMX_SRCREV_ABBREV = "bc7b6a2"
-SRC_URI[md5sum] = "d921b6daf89eba252b0b5b59abe0d690"
-SRC_URI[sha256sum] = "cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3"
-COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
deleted file mode 100644
index fb73322a..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-IMX_SRCREV_ABBREV = "bc7b6a2"
-SRC_URI[md5sum] = "e6ac75617944d9a9dbba90f863f07e0f"
-SRC_URI[sha256sum] = "5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1"
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
new file mode 100644
index 00000000..4cdc1d6a
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+IMX_SRCREV_ABBREV = "95408a4"
+SRC_URI[sha256sum] = "c479c98e83866a7e95e5a6ae29b21ae41f9599326298d9a1debf009cac6e9406"
+COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
new file mode 100644
index 00000000..c5208b55
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+IMX_SRCREV_ABBREV = "95408a4"
+SRC_URI[sha256sum] = "aadfcf558d07da253a57acfd5aa4ca41d4c8195f04324d0c2f6746f6f18c5a46"
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
new file mode 100644
index 00000000..e4fafeb0
--- /dev/null
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -0,0 +1,107 @@
+SUMMARY = "Graphics libraries and driver for i.MX Mali GPU"
+SECTION = "libs"
+DEPENDS = " \
+    libdrm \
+    vulkan-loader \
+    wayland \
+    wayland-protocols"
+PROVIDES = " \
+    virtual/egl \
+    virtual/libgbm \
+    virtual/libgles1 \
+    virtual/libgles2 \
+    virtual/libgles3"
+# The packaged binaries have been stripped of debug info, so disable
+# operations accordingly.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+PACKAGES =+ " \
+    ${PN}-libegl     ${PN}-libegl-dev \
+    ${PN}-libgbm     ${PN}-libgbm-dev \
+    ${PN}-libgles1   ${PN}-libgles1-dev \
+    ${PN}-libgles2   ${PN}-libgles2-dev \
+    ${PN}-libgles3   ${PN}-libgles3-dev \
+    ${PN}-libvulkan  \
+    ${PN}-opencl-icd ${PN}-opencl-icd-dev"
+# Since libmali.so is loaded by dlopen, include it in the main package
+FILES:${PN} += " \
+    ${libdir}/libmali.so \
+    ${nonarch_base_libdir}/firmware"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP:${PN} = "dev-so"
+FILES:${PN}-libegl = " \
+    ${libdir}/libEGL${SOLIBS}"
+FILES:${PN}-libgbm = " \
+    ${libdir}/libgbm${SOLIBS}"
+FILES:${PN}-libgles1 = " \
+    ${libdir}/libGLESv1_CM${SOLIBS}"
+FILES:${PN}-libgles2 = " \
+    ${libdir}/libGLESv2${SOLIBS}"
+FILES:${PN}-opencl-icd = " \
+    ${sysconfdir}/OpenCL"
+FILES:${PN}-libvulkan = " \
+    ${sysconfdir}/vulkan"
+FILES:${PN}-dev = " \
+    ${bindir}/malisc"
+FILES:${PN}-libegl-dev = " \
+    ${includedir}/EGL \
+    ${includedir}/KHR \
+    ${libdir}/libEGL${SOLIBSDEV} \
+    ${libdir}/pkgconfig/egl.pc"
+FILES:${PN}-libgbm-dev = " \
+    ${includedir}/gbm.h \
+    ${libdir}/libgbm${SOLIBSDEV} \
+    ${libdir}/pkgconfig/gbm.pc"
+# Consolidate GLES dev packages
+PACKAGES =+ "${PN}-libgles-dev"
+FILES:${PN}-libgles-dev = " \
+    ${includedir}/GLES* \
+    ${libdir}/libGLES*${SOLIBSDEV} \
+    ${libdir}/pkgconfig/gles*.pc"
+DEBIAN_NOAUTONAME:${PN}-libgles-dev = "1"
+RREPLACES:${PN}-libgles-dev = "libgles-dev"
+RPROVIDES:${PN}-libgles-dev = "libgles-dev"
+RCONFLICTS:${PN}-libgles-dev = "libgles-dev"
+ALLOW_EMPTY:${PN}-libgles1-dev = "1"
+ALLOW_EMPTY:${PN}-libgles2-dev = "1"
+ALLOW_EMPTY:${PN}-libgles3-dev = "1"
+RDEPENDS:${PN}-libgles1-dev = "${PN}-libgles-dev"
+RDEPENDS:${PN}-libgles2-dev = "${PN}-libgles-dev"
+RDEPENDS:${PN}-libgles3-dev = "${PN}-libgles-dev"
+FILES:${PN}-opencl-icd-dev = " \
+    ${bindir}/mali_clcc"
+python __anonymous() {
+    # Avoid Debian-renaming
+    for p in (("libegl",    "libegl1"      ),
+              ("libgbm",    "libgbm1"      ),
+              ("libgles1",  "libglesv1-cm1"),
+              ("libgles2",  "libglesv2-2"  ),
+              ("libgles3",                 )):
+        fullp = "${PN}-" + p[0]
+        pkgs = "".join(' %s' % i for i in p)
+        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
+        d.appendVar("RREPLACES:"  + fullp, pkgs)
+        d.appendVar("RPROVIDES:"  + fullp, pkgs)
+        d.appendVar("RCONFLICTS:" + fullp, pkgs)
+        # libmali.so is loaded with dlopen, so an explicit runtime dependency is necessary
+        d.appendVar("RDEPENDS:"   + fullp, "${PN}")
+        # For -dev, the first element is both the Debian and original name
+        fullp += "-dev"
+        pkgs = p[0] + "-dev"
+        d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
+        d.appendVar("RREPLACES:"  + fullp, pkgs)
+        d.appendVar("RPROVIDES:"  + fullp, pkgs)
+        d.appendVar("RCONFLICTS:" + fullp, pkgs)
+}
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
diff --git a/recipes-graphics/mali/mali-imx_r50.0.bb b/recipes-graphics/mali/mali-imx_r50.0.bb
new file mode 100644
index 00000000..3d30f468
--- /dev/null
+++ b/recipes-graphics/mali/mali-imx_r50.0.bb
@@ -0,0 +1,25 @@
+require mali-imx.inc
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI[sha256sum] = "a787a3285c3e288eedacf1a746de2bc9f5fdc15f35cf8b6147deb436183baf6f"
+IMX_SRCREV_ABBREV = "39604c3"
+S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack
+do_install () {
+    install -d ${D}
+    cp -r ${S}/etc ${S}/usr ${D}
+    # Move firmware to nonarch_base_libdir
+    if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then
+        install -d ${D}${nonarch_base_libdir}
+        mv ${D}${base_libdir}/firmware ${D}${nonarch_base_libdir}
+    fi
+}
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
index 658b28de..23af6828 100644
--- a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
+++ b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
@@ -9,6 +9,8 @@ SRC_URI = "\
    file://mesa-etnaviv.sh \
 "
+S = "${UNPACKDIR}"
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
new file mode 100644
index 00000000..da738aab
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -0,0 +1,52 @@
+From 3448c245b15928aa5a5a3695d9271fb201eb2e3b Mon Sep 17 00:00:00 2001
+From: Yuan Tian <yuan.tian@nxp.com>
+Date: Sat, 27 Apr 2024 06:06:54 +0800
+Subject: [PATCH] LF-11869 change mali wsi layer activating order
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
+---
+ loader/loader.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+diff --git a/loader/loader.c b/loader/loader.c
+index e646b28b4..55912c178 100644
+--- a/loader/loader.c
+++ b/loader/loader.c
+@@ -2906,6 +2906,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+ #if !defined(_WIN32)
+     char temp_path[2048];
+ #endif
+    bool has_wsi_layer = false;
+ 
+     // Now, parse the paths
+     next_file = search_path;
+@@ -2965,6 +2966,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                 name = full_path;
+ 
+                 VkResult local_res;
+                if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) {
+                    has_wsi_layer = true;
+                    continue;
+                }
+                 local_res = add_if_manifest_file(inst, name, out_files);
+ 
+                 // Incomplete means this was not a valid data file.
+@@ -2975,6 +2980,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                     break;
+                 }
+             }
+
+            if(has_wsi_layer) {
+                name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json";
+                vk_result = add_if_manifest_file(inst, name, out_files);
+                has_wsi_layer = false;
+            }
+
+             loader_closedir(inst, dir_stream);
+             if (vk_result != VK_SUCCESS) {
+                 goto out;
+-- 
+2.34.1
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
index c1a9902b..9b0ce3b9 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
@@ -1,3 +1,9 @@
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}:"
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
+"
 # libvulkan.so is loaded dynamically, so put it in the main package
 SOLIBS          = ".so*"
 FILES_SOLIBSDEV = ""
diff --git a/recipes-graphics/wayland/weston_12.0.4.imx.bb b/recipes-graphics/wayland/weston_12.0.4.imx.bb
index 87593e4b..8003da07 100644
--- a/recipes-graphics/wayland/weston_12.0.4.imx.bb
+++ b/recipes-graphics/wayland/weston_12.0.4.imx.bb
@@ -172,7 +172,7 @@ SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
 WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
 SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
 SRCBRANCH = "weston-imx-12.0.4"
-SRCREV = "461c49d20677cfd36d01a95dafbd9eedf2a4b09c"
+SRCREV = "c3c1f9ff7824123dd4808ace3c9476345cb84177"
 S = "${WORKDIR}/git"
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
@@ -186,6 +186,9 @@ PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
 # Weston with i.MX G2D renderer
 PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
+# Weston on RDP, fix for base recipe
+PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
 # links with imx-gpu libs which are pre-built for glibc
 # gcompat will address it during runtime
 LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
index 55a4beda..5bd58cb1 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
@@ -13,6 +13,8 @@ S = "${WORKDIR}/git/vvcam/v4l2"
 inherit module
+MODULES_MODULE_SYMVERS_LOCATION = "dwe"
 DEBUG_PREFIX_MAP:prepend = " \
    -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
    -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.6.bb
index 4810ca11..7bf04fce 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.6.bb
@@ -28,20 +28,24 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v6.6.23
+#    tag: v6.6.51
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: lf-6.6.3-1.0.00
+#    tag: lf-6.6.23-2.0.0
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
-# - f67cb9a5b4fb7 Revert "net: stmmac: fix FPE events losing"
-# - 1918c2eb8b07f Revert "dmaengine: fsl-edma: fix DMA channel leak in eDMAv4"
+# $ git log --oneline  --no-merges v6.6.34.. ^mainline/linux-6.6.y ^NXP/lf-6.6.y
-# - 42289407ee38f Revert "dmaengine: fsl-edma: Add judgment on enabling round robin arbitration"
+# - a10c64e35a24 tty: vt: conmakehash: cope with abs_srctree no longer in env
-# - 952f79923f055 Revert "dmaengine: fsl-edma: Do not suspend and resume the masked dma channel when the system is sleeping"
+# - 3fb57e773e55 tty: vt: conmakehash: Don't mention the full path of the input in output
+# - d1198b88bc1b Revert "dmaengine: fsl-edma: add address for channel mux register in fsl_edma_chan"
+# - 717fee4a9cf7 Revert "dmaengine: fsl-edma: add i.MX8ULP edma support"
+# - 74ef72069927 Revert "dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string"
+# - b54c6ea17058 Revert "dmaengine: fsl-edma: change the memory access from local into remote mode in i.MX 8QM"
 #
 # NOTE to upgraders:
 # This recipe should NOT collect individual patches, they should be applied to
@@ -51,16 +55,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 require linux-imx.inc
-KBRANCH = "6.6-2.0.x-imx"
+KBRANCH = "6.6-2.1.x-imx"
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-SRCREV = "dd280fd310dd5fabbff7393175ee9d7a6aea6b34"
+SRCREV = "ea326ecb9fc05493c53e51832e447c157268e2ab"
 # 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.6.23"
+LINUX_VERSION = "6.6.54"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.6.bb b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
new file mode 100644
index 00000000..a8c91cdb
--- /dev/null
+++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
@@ -0,0 +1,37 @@
+# Copyright (C) 2012-2024 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# SPDX-License-Identifier: MIT
+#
+SUMMARY = "FSL Community BSP Linux LTS based kernel with backported features and fixes"
+DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in order to \
+provide support for some backported features and fixes, or because it was applied in upstream \
+and will not become part of a LTS version, or because it is not applicable for \
+upstreaming in any form."
+require linux-imx.inc
+SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
+# 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.6.50"
+KBRANCH = "6.6.x+fslc"
+SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699"
+KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx8-generic-bsp = "defconfig"
+KBUILD_DEFCONFIG:mx9-generic-bsp = "defconfig"
+KBUILD_DEFCONFIG:mxs-generic-bsp = "mxs_defconfig"
+KBUILD_DEFCONFIG:vf-generic-bsp = "imx_v6_v7_defconfig"
+LOCALVERSION = "-fslc"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.11.bb
index 1919eacd..0de192d4 100644
--- a/recipes-kernel/linux/linux-fslc_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc_6.11.bb
@@ -14,15 +14,19 @@ require linux-imx.inc
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
+DEPENDS += " \
+    coreutils-native \
+"
 # 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.6.50"
+LINUX_VERSION = "6.11.7"
-KBRANCH = "6.6.x+fslc"
+KBRANCH = "6.11.x+fslc"
-SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699"
+SRCREV = "10167047cf0d918ad8e31638e52b7fd620039698"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-imx-headers_6.6.bb b/recipes-kernel/linux/linux-imx-headers_6.6.bb
index 65634ac9..826b2189 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.6.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.6.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-6.6.y"
-LOCALVERSION = "-6.6.23-2.0.0"
+LOCALVERSION = "-6.6.36-2.1.0"
-SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387"
+SRCREV = "d23d64eea5111e1607efcce1d601834fceec92cb"
 S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-imx_6.6.bb b/recipes-kernel/linux/linux-imx_6.6.bb
index b90b40d3..e7475da4 100644
--- a/recipes-kernel/linux/linux-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-imx_6.6.bb
@@ -13,8 +13,8 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
 require recipes-kernel/linux/linux-imx.inc
 SRCBRANCH = "lf-6.6.y"
-LOCALVERSION = "-6.6.23-2.0.0"
+LOCALVERSION = "-6.6.36-2.1.0"
-SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387"
+SRCREV = "d23d64eea5111e1607efcce1d601834fceec92cb"
 SRC_URI += " \
    file://0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch \
@@ -27,7 +27,7 @@ SRC_URI += " \
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.6.23"
+LINUX_VERSION = "6.6.36"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index b05c3a48..d1eec405 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -20,7 +20,7 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
 SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
index c53025b7..f6d094f5 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
@@ -190,8 +190,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
 SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch"
 GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
-SRCREV = "869cef4efbc004c795392d274e617f2dfa71ac98"
+SRCREV = "7011fdfa6d60fb3ee1dc8545f675cfdb519203cd"
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
index 348a30dc..6e7bc20e 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
@@ -118,8 +118,8 @@ SRC_URI:remove = " \
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
-SRCREV = "1c9913d7ce81c43cbf756158a35f61dbeee19ea3"
+SRCREV = "97b1a45e945d3784790cafd2fcc4f6cb16e739d7"
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
index 5d5a2425..67dc139f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
@@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu
 SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
-SRCREV = "50535da48c564bd3a46b2e39e0a3a97cf7e86df3"
+SRCREV = "d8727edd56536a5c39de7905f073fce61896c0af"
 # set 32bit compile timer for 32-bit platform
 GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = ""
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
index 33b3c65c..43cb6a4a 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
@@ -95,8 +95,8 @@ LIC_FILES_CHKSUM = " \
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
-SRCREV = "753c7b4471d14befd1b7c9cd3fa9af9f10ab4a08"
+SRCREV = "eb286c0766a4fbbae70c8e9dda074f5a90e52e42"
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
deleted file mode 100644
index 5a58a5a6..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bda3461b0b6493f3e04910e82e6e530a64af26b1 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Mon, 24 Jul 2023 12:09:34 -0700
-Subject: [PATCH] meson: Undef _TIME_BITS along with _FILE_OFFSET_BITS
-On gcc 13, _TIME_BITS is set to 64 and causes failure with the undef of
-_FILE_OFFSET_BITS:
-```
-/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-   26 | #   error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-      |     ^~~~~
-```
-Upstream-Status: Pending
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/meson.build b/meson.build
-index 7ec5c70..64b2930 100644
--- a/meson.build
-+++ b/meson.build
-@@ -24,6 +24,7 @@ gst_dep = dependency('gstreamer-' + api_version, version : gst_req)
- #meson automaticaly add _FILE_OFFSET_BITS=64 to gcc, this will make ipu test
- #case fail when do mmap on 6q, autoconf didn't add this define, so undef it
- add_project_arguments('-U_FILE_OFFSET_BITS', language: 'c')
-+add_project_arguments('-U_TIME_BITS', language: 'c')
- 
- #below two marcos are defined in autoconf
- add_project_arguments ('-DARM', language: 'c')
-- 
-2.25.1
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index d5ba00ed..e5898077 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -34,13 +34,11 @@ RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
-PV = "4.9.0+git${SRCPV}"
+PV = "4.9.1+git${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
-           file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
-           "
+SRCREV = "87135d5f084b6c61efa6671cddc3a5509ab11640"
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
-SRCREV = "c3049a137f79e4eabc98785aefcd217ebcde9e96"
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb
index 86bab3fc..890a25b4 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb
@@ -1,15 +1,15 @@
-# Copyright 2023 NXP
+# Copyright 2023-2024 NXP
 DESCRIPTION = "NXP Multimedia opencl converter lib"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 DEPENDS = "virtual/opencl-icd"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "efe25d6"
+IMX_SRCREV_ABBREV = "f2c3930"
-SRC_URI[md5sum] = "daa99b8615ca08280833bb80bc52c9be"
+SRC_URI[md5sum] = "c57b978d29bf136be3523676ad088b07"
-SRC_URI[sha256sum] = "1717f7fe64b260156b8d5b353add5edb7bc0217dd3847ac641601d4a59494f08"
+SRC_URI[sha256sum] = "eb3df72a7e1d16ec1660978cf36b7818b8ac7c7defe3222ae4bb7dabd4a5f4cc"
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack autotools pkgconfig meson
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb
index 4bbf6dfb..4094809f 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -13,9 +13,12 @@ RREPLACES:${PN} = "libfslparser"
 RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "700b4cf3ba547dc740a064787f528af0"
+IMX_SRCREV_ABBREV = "5d91190"
-SRC_URI[sha256sum] = "2f0fc3955f824936c359b3cb738549213823b0c366b2362bba593058da745677"
+S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+SRC_URI[md5sum] = "086773073ed8fba17eab80b35a740a46"
+SRC_URI[sha256sum] = "087badea414540d1b9403be1a0c7fc91ac42a61f0374857972cd06d8c392ddec"
 inherit fsl-eula-unpack autotools pkgconfig
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index f7a8e352..2b737999 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
@@ -15,8 +15,8 @@ SRC_URI = " \
    file://0001-vpu_wrapper_hantro_encoder-add-sys-time.h-for-gettim.patch \
    file://0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch \
 "
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
-SRCREV = "73093da30dc4053c9f69813a6447091bfca5429b"
+SRCREV = "c13069d239cae314adc3651df25b96afa46cb434"
 S = "${WORKDIR}/git"
diff --git a/recipes-security/optee-imx/optee-client_4.2.0.imx.bb b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb
index 64b49b75..59f8c84d 100644
--- a/recipes-security/optee-imx/optee-client_4.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb
@@ -1,6 +1,6 @@
 require optee-client-fslc-imx.inc
-SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
 SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0" 
 DEPENDS += "util-linux"
diff --git a/recipes-security/optee-imx/optee-os-fslc-imx.inc b/recipes-security/optee-imx/optee-os-fslc-imx.inc
index 6b72e827..f4a532b7 100644
--- a/recipes-security/optee-imx/optee-os-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-fslc-imx.inc
@@ -22,5 +22,6 @@ PLATFORM_FLAVOR:mx8dx-nxp-bsp     = "mx8dxmek"
 PLATFORM_FLAVOR:mx8dxl-nxp-bsp    = "mx8dxlevk"
 PLATFORM_FLAVOR:mx8ulp-nxp-bsp    = "mx8ulpevk"
 PLATFORM_FLAVOR:mx93-nxp-bsp      = "mx93evk"
+PLATFORM_FLAVOR:mx95-nxp-bsp      = "mx95evk"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index b91a5531..61906344 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 NXP
+# Copyright (C) 2017-2021,2024 NXP
 SUMMARY = "OPTEE OS"
 DESCRIPTION = "OPTEE OS"
@@ -84,4 +84,7 @@ FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_arm
 FILES:${PN}-staticdev = "${includedir}/optee/"
 RDEPENDS:${PN}-dev += "${PN}-staticdev"
+# FIXME: Build paths are currently embedded
+INSANE_SKIP:${PN}-staticdev += "buildpaths"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee-imx/optee-os_4.2.0.imx.bb b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb
index 96948bc7..ada545a6 100644
--- a/recipes-security/optee-imx/optee-os_4.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb
@@ -8,5 +8,5 @@ SRC_URI += " \
    file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \
    file://0004-core-link-add-no-warn-rwx-segments.patch \
 "
-SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
-SRCREV = "c6be5b572452a2808d1a34588fd10e71715e23cf"
+SRCREV = "612bc5a642a4608d282abeee2349d86de996d7ee"
diff --git a/recipes-security/optee-imx/optee-test_4.2.0.imx.bb b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb
index aa8444fb..e2cf40e9 100644
--- a/recipes-security/optee-imx/optee-test_4.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb
@@ -4,7 +4,7 @@ require optee-test-fslc.inc
 SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
-SRCREV = "07682f1b1b41ec0bfa507286979b36ab8d344a96"
+SRCREV = "5b52b48a73b4cc3f228ec66ae6cf9920897bb2e6"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb
index 6d13d107..3afa2522 100644
--- a/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/recipes-support/opencv/opencv_4.6.0.imx.bb
@@ -268,7 +268,7 @@ SRCREV_opencv = "d3440df40a6e90cd1d2a1b729bcbc16aa4d42f5d"
 # Add opencv_extra
 SRC_URI += " \
    git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \
-    file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \
+    file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=${UNPACKDIR}/extra \
 "
 SRCREV_FORMAT:append = "_extra"
 SRCREV_extra = "936854e2b666853d6d0732a8eabc2d699f4fa3d8"
@@ -293,7 +293,7 @@ PACKAGECONFIG_OPENCL:mx8mnul-nxp-bsp = ""
 PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx,"
 PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native,"
 PACKAGECONFIG[qt6] = "-DWITH_QT=ON -DQT_HOST_PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native},-DWITH_QT=OFF,qtbase qtbase-native,"
-PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF,"
+PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${UNPACKDIR}/extra/testdata, -DINSTALL_TESTS=OFF,"
 PACKAGECONFIG[tim-vx] = "-DWITH_TIMVX=ON -DTIMVX_INSTALL_DIR=${STAGING_DIR_HOST}${libdir},-DWITH_TIMVX=OFF,tim-vx"
 # Disable cvv module in opencv_contrib as it is not yet suppported for Qt6
diff --git a/wic/imx-imx-boot-bootpart.wks.in b/wic/imx-imx-boot-bootpart.wks.in
index 20af7a6a..e8e6e891 100644
--- a/wic/imx-imx-boot-bootpart.wks.in
+++ b/wic/imx-imx-boot-bootpart.wks.in
@@ -10,11 +10,11 @@
 #  - ---------- -------------- --------------
 # ^ ^          ^              ^              ^
 # | |          |              |              |
-# 0 |        8MiB          72MiB          72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+# 0 |        8MiB          264MiB         264MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #   ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
 #
 part u-boot --source rawcopy --sourceparams="file=imx-boot.tagged" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 256
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192
 bootloader --ptable msdos