zephyr: sof: update board name for HWMv2

Update NXP board names and configs with the ones for HWMv2. Signed-off-by: Iuliana Prodan <[email protected]>
zephyrproject-rtos · Feb 28, 2024 · 4566838 · 4566838
1 parent 0606152
commit 4566838
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/app/boards/nxp_adsp_imx8m.conf → app/boards/imx8mp_evk_mimx8ml8_adsp.conf b/app/boards/nxp_adsp_imx8m.conf → app/boards/imx8mp_evk_mimx8ml8_adsp.conf
diff --git a/app/boards/nxp_adsp_imx8.conf → app/boards/imx8qm_mek_mimx8qm6_adsp.conf b/app/boards/nxp_adsp_imx8.conf → app/boards/imx8qm_mek_mimx8qm6_adsp.conf
diff --git a/app/boards/nxp_adsp_imx8.overlay → app/boards/imx8qm_mek_mimx8qm6_adsp.overlay b/app/boards/nxp_adsp_imx8.overlay → app/boards/imx8qm_mek_mimx8qm6_adsp.overlay
diff --git a/app/boards/nxp_adsp_imx8x.conf → app/boards/imx8qxp_mek_mimx8qx6_adsp.conf b/app/boards/nxp_adsp_imx8x.conf → app/boards/imx8qxp_mek_mimx8qx6_adsp.conf
diff --git a/app/boards/nxp_adsp_imx8x.overlay → app/boards/imx8qxp_mek_mimx8qx6_adsp.overlay b/app/boards/nxp_adsp_imx8x.overlay → app/boards/imx8qxp_mek_mimx8qx6_adsp.overlay
diff --git a/app/boards/nxp_adsp_imx8ulp.conf → app/boards/imx8ulp_evk_imx8ulp_adsp.conf b/app/boards/nxp_adsp_imx8ulp.conf → app/boards/imx8ulp_evk_imx8ulp_adsp.conf
diff --git a/app/sample.yaml b/app/sample.yaml
@@ -14,16 +14,16 @@ tests:
       - intel_adsp_cavs25
       - intel_adsp_ace15_mtpm
       - intel_adsp_ace20_lnl
-      - nxp_adsp_imx8
-      - nxp_adsp_imx8x
-      - nxp_adsp_imx8m
-      - nxp_adsp_imx8ulp
+      - imx8qm_mek/mimx8qm6/adsp
+      - imx8qxp_mek/mimx8qx6/adsp
+      - imx8mp_evk/mimx8ml8/adsp
+      - imx8ulp_evk/imx8ulp/adsp
 
     integration_platforms:
       - intel_adsp_cavs25  # TGL
       - intel_adsp_ace15_mtpm  # MTL
       - intel_adsp_ace20_lnl
-      - nxp_adsp_imx8
-      - nxp_adsp_imx8x
-      - nxp_adsp_imx8m
-      - nxp_adsp_imx8ulp
+      - imx8qm_mek/mimx8qm6/adsp
+      - imx8qxp_mek/mimx8qx6/adsp
+      - imx8mp_evk/mimx8ml8/adsp
+      - imx8ulp_evk/imx8ulp/adsp
diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
@@ -121,25 +121,25 @@ class PlatformConfig:
 
 	#  NXP platforms
 	"imx8" : PlatformConfig(
-		"imx", "nxp_adsp_imx8",
+		"imx", "imx8qm_mek/mimx8qm6/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_nxp_v5_3_1_prod",
 		RIMAGE_KEY = "key param ignored by imx8",
 	),
 	"imx8x" : PlatformConfig(
-		"imx", "nxp_adsp_imx8x",
+		"imx", "imx8qxp_mek/mimx8qx6/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_nxp_v5_3_1_prod",
 		RIMAGE_KEY = "key param ignored by imx8x"
 	),
 	"imx8m" : PlatformConfig(
-		"imx", "nxp_adsp_imx8m",
+		"imx", "imx8mp_evk/mimx8ml8/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_mscale_v2_0_2_prod",
 		RIMAGE_KEY = "key param ignored by imx8m"
 	),
 	"imx8ulp" : PlatformConfig(
-		"imx", "nxp_adsp_imx8ulp",
+		"imx", "imx8ulp_evk/imx8ulp/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_nxp2_s7_v2_1a_prod",
 		RIMAGE_KEY = "key param ignored by imx8ulp"

diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -232,7 +232,7 @@ if (CONFIG_SOC_SERIES_INTEL_ACE)
 endif()
 
 # NXP IMX8 platforms
-if (CONFIG_SOC_SERIES_NXP_IMX8)
+if (CONFIG_SOC_MIMX8QM_ADSP OR CONFIG_SOC_MIMX8QXP_ADSP)
 	zephyr_library_sources(
 		${SOF_DRIVERS_PATH}/generic/dummy-dma.c
 		${SOF_DRIVERS_PATH}/imx/edma.c
@@ -261,7 +261,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8)
 	set(PLATFORM "imx8")
 endif()
 
-if (CONFIG_SOC_SERIES_NXP_IMX8M)
+if (CONFIG_SOC_MIMX8MP_ADSP)
 	zephyr_library_sources(
 		${SOF_DRIVERS_PATH}/generic/dummy-dma.c
 		${SOF_DRIVERS_PATH}/imx/sdma.c
@@ -290,7 +290,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8M)
 	set(PLATFORM "imx8m")
 endif()
 
-if (CONFIG_SOC_SERIES_NXP_IMX8ULP)
+if (CONFIG_SOC_MIMX8ULP_ADSP)
 	zephyr_library_sources(
 		${SOF_DRIVERS_PATH}/generic/dummy-dma.c
 		${SOF_DRIVERS_PATH}/imx/edma.c