Merge pull request #2907 from matheusmbar/add_imx952HEADmaster

Add i.MX 952 SoC and its first machines

10 files changed, 270 insertions, 5 deletions

diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index c5facea07..f887a3a02 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -25,6 +25,7 @@ SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}-ahab-contai
 SECO_FIRMWARE_NAME:mx91-generic-bsp ?= "mx91${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"
+SECO_FIRMWARE_NAME:mx952-generic-bsp ?= "mx952${IMX_SOC_REV_LOWER}-ahab-container.img"
 
 # Parse-time guard: SoCs that require a SECO firmware must fail parsing early
 # (SkipRecipe) when SECO_FIRMWARE_NAME is undefined, which needs anonymous python.
diff --git a/conf/machine/imx952-15x15-lpddr5-frdm.conf b/conf/machine/imx952-15x15-lpddr5-frdm.conf
new file mode 100644
index 000000000..a406e5207
--- /dev/null
+++ b/conf/machine/imx952-15x15-lpddr5-frdm.conf
@@ -0,0 +1,65 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX 952 15x15 FRDM with LPDDR5
+#@SOC: i.MX952
+#@DESCRIPTION: Machine configuration for NXP i.MX 952 FRDM with LPDDR5
+#@MAINTAINER: Flora Hu <flora.hu@nxp.com>
+
+require conf/machine/include/imx952-evk.inc
+
+KERNEL_DEVICETREE_BASENAME = "imx952-frdm"
+
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpiw612-sdio"
+
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/imx952-jailhouse-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302-csi0-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302-csi1-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-dual-ap1302.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi0-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi0-2lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi1-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi1-2lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-dual.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-v2x-she0.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-waveshare-7inch-c-panel.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-waveshare-7inch-c-panel.dtbo \
+"
+
+UBOOT_CONFIG_BASENAME = "imx952_frdm"
+
+IMXBOOT_TARGETS_BASENAME = "flash"
+
+OEI_BOARD  = "mx952lp5-15-frdm"
+DDR_TYPE   = "lpddr5"
+OEI_DDR_CONFIG  = "MIMX952_LPDDR5_FRDM_15X15_4266MTS_FW2024.09-SP2_timing"
+OEI_DDR_CONFIG_ECC = "MIMX952_LPDDR5_FRDM_15X15_4266MTS_FW2024.09-SP2_ECC_enabled_timing"
+
+# Multiple system manager configs by IMXBOOT_VARIANT
+SYSTEM_MANAGER_CONFIG = \
+    "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       'mx952alt', \
+        bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', 'mx952evkjailhouse', \
+        bb.utils.contains('IMXBOOT_VARIANT', 'netc',      'mx952evknetc', \
+        bb.utils.contains('IMXBOOT_VARIANT', 'rpmsg',     'mx952frdmrpmsg', \
+                                                          'mx952evk', d), d), d), d)}"
+
+M4_DEFAULT_IMAGE_MX952 = "imx952-15x15-frdm_m7_TCM_power_mode_switch.bin"
+
+DDR_FIRMWARE_NAME = " \
+    lpddr5_dmem_v202409.bin \
+    lpddr5_dmem_qb_v202409.bin \
+    lpddr5_imem_v202409.bin \
+    lpddr5_imem_qb_v202409.bin \
+"
+
+IMAGE_BOOT_FILES:append = " \
+    mcore-demos/imx952-15x15-frdm_m7_TCM_hello_world.bin \
+    mcore-demos/imx952-15x15-frdm_m7_TCM_power_mode_switch.bin \
+    mcore-demos/imx952-15x15-frdm_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx952-15x15-frdm_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+"
diff --git a/conf/machine/imx952-19x19-lpddr5-evk.conf b/conf/machine/imx952-19x19-lpddr5-evk.conf
new file mode 100644
index 000000000..391f4a23e
--- /dev/null
+++ b/conf/machine/imx952-19x19-lpddr5-evk.conf
@@ -0,0 +1,93 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX 952 19x19 Evaluation Kit with LPDDR5
+#@SOC: i.MX952
+#@DESCRIPTION: Machine configuration for NXP i.MX 952 19x19 EVK with LPDDR5
+#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
+
+require conf/machine/include/imx952-evk.inc
+
+KERNEL_DEVICETREE_BASENAME = "imx952-evk"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpaw693-pcie"
+
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/imx952-jailhouse-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535-ap1302-csi0-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535-ap1302-csi0-4lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302-csi0-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302-csi0-2lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302-csi0-4lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302-csi0-4lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-audmix.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-crrm.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-cs42888.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-serdes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-ox03c10-csi0.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-os08a20-csi0-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-os08a20-csi0-4lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-ox05b1s-csi0-4lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-os08a20-csi1-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-os08a20-dual.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds1.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds1.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds-two-disp.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds-dual.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds-dual.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds-panel.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds-panel.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-kd123c02.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-kd123c02.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-netc-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi0-2lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi0-2lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi0-4lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi0-4lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-csi1-2lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10-csi0.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10-csi0.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-csi0-4lanes.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-csi0-4lanes.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-keym.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-keym.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-sgmii.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-tja1104-rgmii.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-tja1104-rmii.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-v2x-she0.dtb \
+"
+
+UBOOT_CONFIG_BASENAME = "imx952_evk"
+
+IMXBOOT_TARGETS_BASENAME = "flash"
+
+OEI_BOARD  = "mx952lp5-19"
+DDR_TYPE   = "lpddr5"
+DDR_FIRMWARE_NAME = " \
+    lpddr5_dmem_v202409.bin \
+    lpddr5_dmem_qb_v202409.bin \
+    lpddr5_imem_v202409.bin \
+    lpddr5_imem_qb_v202409.bin \
+"
+OEI_DDR_CONFIG     = "MIMX952_LPDDR5_EVK_19X19_6000MTS_FW2024.09-SP2_timing"
+OEI_DDR_CONFIG_ECC = "MIMX952_LPDDR5_EVK_19X19_6000MTS_FW2024.09-SP2_ECC_enabled_timing"
+
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx952evk_m7_TCM_hello_world.bin \
+    mcore-demos/imx952evk_m7_TCM_netc_share.bin \
+    mcore-demos/imx952evk_m7_TCM_power_mode_switch.bin \
+    mcore-demos/imx952evk_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx952evk_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx952evk_m7_TCM_sai_low_power_audio.bin \
+"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index be7a32315..5634d3912 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -192,6 +192,7 @@ IMX_SOC_REV:mx8ulp-generic-bsp ??= \
 IMX_SOC_REV:mx93-generic-bsp   ??= "A1"
 IMX_SOC_REV:mx943-generic-bsp  ??= "A1"
 IMX_SOC_REV:mx95-generic-bsp   ??= "B0"
+IMX_SOC_REV:mx952-generic-bsp  ??= "A1"
 
 IMX_SOC_REV_LOWER   = "${@d.getVar('IMX_SOC_REV').lower()}"
 IMX_SOC_REV_UPPER   = "${@d.getVar('IMX_SOC_REV').upper()}"
@@ -235,6 +236,7 @@ MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdr
 MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx943:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx94-generic-bsp:mx94-nxp-bsp:mx943-generic-bsp:mx943-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx952:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp:mx952-generic-bsp:mx952-nxp-bsp"
 
 #######
 ### Mainline BSP specific overrides
@@ -315,6 +317,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
     mx93 \
     mx943 \
     mx95 \
+    mx952 \
 "
 
 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'."
@@ -346,6 +349,7 @@ MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp    = "-mx91"
 MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp    = "-mx93"
 MACHINE_SOCARCH_SUFFIX:mx943-nxp-bsp   = "-mx943"
 MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp    = "-mx95"
+MACHINE_SOCARCH_SUFFIX:mx952-nxp-bsp   = "-mx952"
 
 # For Mainline we use a single SoC suffix as we don't have different build options
 MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx"
@@ -458,9 +462,11 @@ IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx"
 IMX_EXTRA_FIRMWARE:mx91-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
 IMX_EXTRA_FIRMWARE:mx93-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx"
 IMX_EXTRA_FIRMWARE:mx943-nxp-bsp      = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
+IMX_EXTRA_FIRMWARE:mx95-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
+IMX_EXTRA_FIRMWARE:mx952-generic-bsp  = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
+
 PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager"
 PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei"
-IMX_EXTRA_FIRMWARE:mx95-generic-bsp   = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
 
 # The System Manager firmware name selects the binary imx-boot takes from the
 # deploy folder; imx-system-manager deploys it as
@@ -468,6 +474,7 @@ IMX_EXTRA_FIRMWARE:mx95-generic-bsp   = "imx-boot-firmware-files firmware-ele-im
 SYSTEM_MANAGER_FIRMWARE_NAME_DEFAULT = ""
 SYSTEM_MANAGER_FIRMWARE_NAME_DEFAULT:mx943-generic-bsp = "${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}"
 SYSTEM_MANAGER_FIRMWARE_NAME_DEFAULT:mx95-generic-bsp  = "${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}"
+SYSTEM_MANAGER_FIRMWARE_NAME_DEFAULT:mx952-generic-bsp = "${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}"
 SYSTEM_MANAGER_FIRMWARE_NAME ?= "${SYSTEM_MANAGER_FIRMWARE_NAME_DEFAULT}"
 
 # Firmware
@@ -489,8 +496,9 @@ 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:mx95-generic-bsp     = " firmware-imx-vpu-wave"
 MACHINE_FIRMWARE:append:mx95-mainline-bsp    = " linux-firmware-mali-csffw-arch1012"
+MACHINE_FIRMWARE:append:mx952-nxp-bsp        = " firmware-imx-vpu-coda980 firmware-imx-vpu-wave511 firmware-imx-ld"
 
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
 
@@ -548,8 +556,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 # to a single rootfs.
 SECOEXT_FIRMWARE_NAME ?= ""
 SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img"
-SECOEXT_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95a0runtime-ahab-container.img mx95b0runtime-ahab-container.img"
 SECOEXT_FIRMWARE_NAME:mx943-generic-bsp  ?= "mx94${IMX_SOC_REV_LOWER}runtime-ahab-container.img"
+SECOEXT_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95a0runtime-ahab-container.img mx95b0runtime-ahab-container.img"
+SECOEXT_FIRMWARE_NAME:mx952-generic-bsp  ?= "mx952a0runtime-ahab-container.img mx952a1runtime-ahab-container.img"
 
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN                ?= ""
diff --git a/conf/machine/include/imx952-evk.inc b/conf/machine/include/imx952-evk.inc
new file mode 100644
index 000000000..d978c6065
--- /dev/null
+++ b/conf/machine/include/imx952-evk.inc
@@ -0,0 +1,75 @@
+MACHINEOVERRIDES =. "mx952:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
+
+MACHINE_FEATURES += "pci wifi bluetooth"
+MACHINE_FEATURES:append:use-nxp-bsp = " crrm jailhouse optee xen"
+
+KERNEL_DEVICETREE = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
+"
+UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
+
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+UBOOT_CONFIG ??= "${@bb.utils.contains('COMBINED_FEATURES', 'crrm', 'crrm', 'sd', d)}"
+UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[sd-ecc] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[crrm] = "${UBOOT_CONFIG_BASENAME}_xspi_crrm_defconfig"
+UBOOT_CONFIG[xspi] = "${UBOOT_CONFIG_BASENAME}_xspi_defconfig"
+
+ATF_PLATFORM = "imx952"
+
+OEI_CORE   = "m33"
+OEI_SOC    = "mx952"
+OEI_BOARD  ?= "mx95lp5"
+
+DDR_TYPE   ?= "lpddr5"
+
+IMXBOOT_VARIANTS = "alt jailhouse netc rpmsg"
+
+# Multiple system manager configs by IMXBOOT_VARIANT
+SYSTEM_MANAGER_CONFIG = \
+    "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       'mx952alt', \
+        bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', 'mx952evkjailhouse', \
+        bb.utils.contains('IMXBOOT_VARIANT', 'netc',      'mx952evknetc', \
+        bb.utils.contains('IMXBOOT_VARIANT', 'rpmsg',     'mx952evkrpmsg', \
+                                                          'mx952evk', d), d), d), d)}"
+
+# imx-boot (flash.bin) targets based on UBOOT_CONFIG and IMXBOOT_VARIANT
+IMXBOOT_TARGETS_SD = " \
+    ${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       '${IMXBOOT_TARGETS_BASENAME}_all', \
+       bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', '${IMXBOOT_TARGETS_BASENAME}_jailhouse', \
+       bb.utils.contains('IMXBOOT_VARIANT', 'netc',      '${IMXBOOT_TARGETS_BASENAME}_all', \
+       bb.utils.contains('IMXBOOT_VARIANT', 'rpmsg',     '${IMXBOOT_TARGETS_BASENAME}_lpboot_sm_a55', \
+                                                         '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d)} \
+"
+IMXBOOT_TARGETS = " \
+    ${@bb.utils.contains('UBOOT_CONFIG', 'crrm',   '${IMXBOOT_TARGETS_BASENAME}_a55_xspi_crrm', \
+       bb.utils.contains('UBOOT_CONFIG', 'sd-ecc', '${IMXBOOT_TARGETS_BASENAME}_all', \
+       bb.utils.contains('UBOOT_CONFIG', 'xspi',   '${IMXBOOT_TARGETS_BASENAME}_a55_xspi', \
+                                                   '${IMXBOOT_TARGETS_SD}', d), d), d)} \
+"
+
+M4_DEFAULT_IMAGE_MX952 = "${@bb.utils.contains('IMXBOOT_VARIANT', 'netc', 'imx952evk_m7_TCM_netc_share.bin', \
+                                                                          'imx952evk_m7_TCM_power_mode_switch.bin', d)}"
+
+IMX_BOOT_SOC_TARGET = "iMX952"
+IMX_BOOT_SEEK = "32"
+
+# We have to disable SERIAL_CONSOLE due to auto-serial-console
+SERIAL_CONSOLES = "115200;ttyLP0"
+
+IMX_DEFAULT_BSP = "nxp"
+
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \
+"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
index 1fc8a090e..23828b55e 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
@@ -67,4 +67,4 @@ do_deploy() {
 FILES:${PN} = "/firmware"
 SYSROOT_DIRS += "/firmware"
 
-COMPATIBLE_MACHINE = "(mx95-generic-bsp|mx943-generic-bsp)"
+COMPATIBLE_MACHINE = "(mx95-generic-bsp|mx943-generic-bsp|mx952-generic-bsp)"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
index 2a736de7b..f3bc96a52 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -39,4 +39,4 @@ do_deploy() {
         ${DEPLOYDIR}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}.bin
 }
 
-COMPATIBLE_MACHINE = "(mx95-generic-bsp|mx943-generic-bsp)"
+COMPATIBLE_MACHINE = "(mx95-generic-bsp|mx943-generic-bsp|mx952-generic-bsp)"
diff --git a/oelint.constants.json b/oelint.constants.json
index d3d67fbe1..02b5b39f1 100644
--- a/oelint.constants.json
+++ b/oelint.constants.json
@@ -285,6 +285,7 @@
             "mx94-nxp-bsp",
             "mx95-generic-bsp",
             "mx95-nxp-bsp",
+            "mx952-generic-bsp",
             "mx952-nxp-bsp",
             "mxs-generic-bsp",
             "p1020",
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index dad78748b..da99f3f3c 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -73,6 +73,7 @@ BOOT_STAGING:mx91-generic-bsp = "${S}/iMX91"
 BOOT_STAGING:mx93-generic-bsp = "${S}/iMX93"
 BOOT_STAGING:mx943-generic-bsp = "${S}/iMX94"
 BOOT_STAGING:mx95-generic-bsp = "${S}/iMX95"
+BOOT_STAGING:mx952-generic-bsp = "${S}/iMX952"
 
 SOC_FAMILY = "INVALID"
 SOC_FAMILY:mx8-generic-bsp = "mx8"
@@ -83,6 +84,7 @@ SOC_FAMILY:mx91-generic-bsp = "mx91"
 SOC_FAMILY:mx93-generic-bsp = "mx93"
 SOC_FAMILY:mx943-generic-bsp = "mx943"
 SOC_FAMILY:mx95-generic-bsp = "mx95"
+SOC_FAMILY:mx952-generic-bsp = "mx952"
 
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 
@@ -107,6 +109,10 @@ MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= "\
 MKIMAGE_EXTRA_ARGS:imx95-a1-19x19-verdin ?= "\
     ${MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin} \
 "
+MKIMAGE_EXTRA_ARGS:mx952-nxp-bsp ?= "\
+    OEI=YES \
+    LPDDR_TYPE=${DDR_TYPE} \
+"
 
 UBOOT_DTB_BINARY ?= "u-boot.dtb"
 
@@ -232,6 +238,12 @@ compile_mx95() {
 }
 compile_mx95[doc] = "Stage the i.MX 93 binaries plus the OEI and System Manager firmware for the i.MX 95 boot container"
 
+compile_mx952() {
+    bbnote i.MX 952 boot binary build
+    compile_mx95
+}
+compile_mx952[doc] = "Stage the i.MX 952 boot container binaries, which are the same as for i.MX 95"
+
 do_compile() {
     # mkimage for i.MX8
     # Copy TEE binary to SoC target folder to mkimage
@@ -421,6 +433,14 @@ deploy_mx95() {
 }
 deploy_mx95[doc] = "Deploy the i.MX 93 boot tools plus the OEI and System Manager firmware for i.MX 95"
 
+deploy_mx952() {
+    deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
+    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
+                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
+}
+deploy_mx952[doc] = "Deploy the i.MX 93 boot tools plus the OEI and System Manager firmware for i.MX 952"
+
 do_deploy() {
     deploy_${SOC_FAMILY}
 
diff --git a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
index 18b9293ff..9cbd1623b 100644
--- a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -36,6 +36,7 @@ OPTEEMACHINE:mx91-nxp-bsp = "imx-mx91evk"
 OPTEEMACHINE:mx93-nxp-bsp = "imx-mx93evk"
 OPTEEMACHINE:mx943-nxp-bsp = "imx-mx943evk"
 OPTEEMACHINE:mx95-nxp-bsp = "imx-mx95evk"
+OPTEEMACHINE:mx952-nxp-bsp = "imx-mx952evk"
 
 # Strip the leading imx-
 PLATFORM_FLAVOR = "${@d.getVar('OPTEEMACHINE')[4:]}"