boards: nxp: Convert i.MX ADSP boards to hardware model v2

Convert i.MX ADSP boards to HMV2 including: - mimx8mp_evk - mimx8qxp_mek - mimx8qm_mek - mimx8ulp_evk Signed-off-by: Iuliana Prodan <[email protected]>
zephyrproject-rtos · Feb 23, 2024 · 8d7d1f7 · 8d7d1f7
1 parent 399d02b
commit 8d7d1f7
Show file tree

Hide file tree

Showing 34 changed files with 111 additions and 111 deletions.
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.board
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.defconfig
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.board
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.defconfig
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.board
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.defconfig
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.board
diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.defconfig
diff --git a/boards/nxp/mimx8mp_evk/Kconfig.mimx8mp_evk b/boards/nxp/mimx8mp_evk/Kconfig.mimx8mp_evk
@@ -0,0 +1,11 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MIMX8MP_EVK
+	select SOC_MIMX8MP_ADSP if BOARD_MIMX8MP_EVK_IMX8MP_ADSP
+	select SOC_MIMX8MP_A53 if BOARD_MIMX8MP_EVK_IMX8MP_A53
+	select SOC_MIMX8MP_A53 if BOARD_MIMX8MP_EVK_IMX8MP_A53_SMP
+	select SOC_PART_NUMBER_MIMX8ML8DVNLZ
+	select SOC_PART_NUMBER_MIMX8ML8CVNKZ
diff --git a/..._legacy/xtensa/nxp_adsp_imx8m/board.cmake → boards/nxp/mimx8mp_evk/board.cmake b/..._legacy/xtensa/nxp_adsp_imx8m/board.cmake → boards/nxp/mimx8mp_evk/board.cmake
@@ -1,6 +1,12 @@
+#
+# Copyright (c) 2024 NXP
+#
 # SPDX-License-Identifier: Apache-2.0
+#
 
+if(CONFIG_SOC_MIMX8MPLUS_ADSP)
 board_set_flasher_ifnset(misc-flasher)
 board_finalize_runner_args(misc-flasher)
 
 board_set_rimage_target(imx8m)
+endif()
diff --git a/boards/nxp/mimx8mp_evk/board.yml b/boards/nxp/mimx8mp_evk/board.yml
@@ -0,0 +1,8 @@
+board:
+  name: mimx8mp_evk
+  vendor: nxp
+  socs:
+    - name: imx8mp
+      variants:
+        - name: adsp
+          cpucluster: ''
diff --git a/.../xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts → ...p/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.dts b/.../xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts → ...p/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, 2023 NXP
+ * Copyright 2021, 2023, 2024 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,7 @@
 #include <nxp/nxp_imx/mimx8ml8dvnlz-pinctrl.dtsi>
 
 / {
-	model = "nxp_adsp_imx8m";
+	model = "NXP i.MX 8MPLUS Audio DSP";
 	compatible = "nxp";
 
 	chosen {

diff --git a/...xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml → .../mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.yaml b/...xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml → .../mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8m
-name: NXP i.MX8M Plus EVK Audio DSP
+identifier: mimx8mp_evk/imx8mp/adsp
+name: NXP i.MX 8MPLUS Audio DSP
 type: mcu
 arch: xtensa
 toolchain:

diff --git a/...a/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig → ...8mp_evk/mimx8mp_evk_imx8mp_adsp_defconfig b/...a/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig → ...8mp_evk/mimx8mp_evk_imx8mp_adsp_defconfig
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NXP_IMX8M=y
-CONFIG_SOC_MIMX8M_ADSP=y
-CONFIG_BOARD_NXP_ADSP_IMX8M=y
-
 # size of stack for initialization and main thread
 CONFIG_MAIN_STACK_SIZE=3072
 

diff --git a/boards/nxp/mimx8qm_mek/Kconfig.mimx8qm_mek b/boards/nxp/mimx8qm_mek/Kconfig.mimx8qm_mek
@@ -0,0 +1,8 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MIMX8QM_MEK
+	select SOC_MIMX8QM_ADSP if BOARD_MIMX8QM_MEK_IMX8QM_ADSP
+	select SOC_PART_NUMBER_MIMX8QM6AVUFF
diff --git a/...s_legacy/xtensa/nxp_adsp_imx8/board.cmake → boards/nxp/mimx8qm_mek/board.cmake b/...s_legacy/xtensa/nxp_adsp_imx8/board.cmake → boards/nxp/mimx8qm_mek/board.cmake
@@ -1,6 +1,12 @@
+#
+# Copyright (c) 2024 NXP
+#
 # SPDX-License-Identifier: Apache-2.0
+#
 
+if(CONFIG_SOC_MIMX8QM_ADSP)
 board_set_flasher_ifnset(misc-flasher)
 board_finalize_runner_args(misc-flasher)
 
-board_set_rimage_target(imx8)
+board_set_rimage_target(imx)
+endif()
diff --git a/boards/nxp/mimx8qm_mek/board.yml b/boards/nxp/mimx8qm_mek/board.yml
@@ -0,0 +1,8 @@
+board:
+  name: mimx8qm_mek
+  vendor: nxp
+  socs:
+    - name: imx8qm
+      variants:
+        - name: adsp
+          cpucluster: ''
diff --git a/.../nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi → ...m_mek/mimx8qm_mek_im8qm_adsp-pinctrl.dtsi b/.../nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi → ...m_mek/mimx8qm_mek_im8qm_adsp-pinctrl.dtsi
diff --git a/.../xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts → ...xp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.dts b/.../xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts → ...xp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.dts
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2021 NXP
+ * Copyright (c) 2021, 2024 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 /dts-v1/;
 
 #include <nxp/nxp_imx8.dtsi>
-#include "nxp_adsp_imx8x-pinctrl.dtsi"
+#include "mimx8qm_mek_im8qm_adsp-pinctrl.dtsi"
 
 / {
-	model = "nxp_adsp_imx8x";
+	model = "NXP i.MX 8QM Audio DSP";
 	compatible = "nxp";
 
 	chosen {

diff --git a/...y/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml → ...p/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.yaml b/...y/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml → ...p/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8
-name: i.MX8 DSP
+identifier: mimx8qm_mek/imx8qm/adsp
+name: NXP i.MX 8QM Audio DSP
 type: mcu
 arch: xtensa
 toolchain:

diff --git a/...nsa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig → ...p/mimx8qm_mek/mimx8qm_mek_im8qm_defconfig b/...nsa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig → ...p/mimx8qm_mek/mimx8qm_mek_im8qm_defconfig
@@ -3,10 +3,6 @@
 CONFIG_MAIN_STACK_SIZE=3072
 
 # board/soc-related configurations
-CONFIG_SOC_SERIES_NXP_IMX8=y
-CONFIG_SOC_MIMX8QM_ADSP=y
-CONFIG_BOARD_NXP_ADSP_IMX8=y
-
 CONFIG_LOG=y
 
 # TODO: maybe move this to SOF?

diff --git a/boards/nxp/mimx8qxp_mek/Kconfig.mimx8qxp_mek b/boards/nxp/mimx8qxp_mek/Kconfig.mimx8qxp_mek
@@ -0,0 +1,9 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MIMX8QXP_MEK
+	select SOC_MIMX8QXP_ADSP if BOARD_MIMX8QXP_MEK_IMX8QXP_ADSP
+	select SOC_PART_NUMBER_MIMX8QX6AVLFZ
+	select SOC_PART_NUMBER_MIMX8QX6CVLDZ
diff --git a/..._legacy/xtensa/nxp_adsp_imx8x/board.cmake → boards/nxp/mimx8qxp_mek/board.cmake b/..._legacy/xtensa/nxp_adsp_imx8x/board.cmake → boards/nxp/mimx8qxp_mek/board.cmake
@@ -1,6 +1,12 @@
+#
+# Copyright (c) 2024 NXP
+#
 # SPDX-License-Identifier: Apache-2.0
+#
 
+if(CONFIG_SOC_MIMX8QXP_ADSP)
 board_set_flasher_ifnset(misc-flasher)
 board_finalize_runner_args(misc-flasher)
 
-board_set_rimage_target(imx8)
+board_set_rimage_target(imx)
+endif()
diff --git a/boards/nxp/mimx8qxp_mek/board.yml b/boards/nxp/mimx8qxp_mek/board.yml
@@ -0,0 +1,8 @@
+board:
+  name: mimx8qxp_mek
+  vendor: nxp
+  socs:
+    - name: imx8qxp
+      variants:
+        - name: adsp
+          cpucluster: ''
diff --git a/...xp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi → ...ek/mimx8qxp_mek_imx8qxp_adsp-pinctrl.dtsi b/...xp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi → ...ek/mimx8qxp_mek_imx8qxp_adsp-pinctrl.dtsi
diff --git a/...cy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts → ...imx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.dts b/...cy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts → ...imx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.dts
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2021 NXP
+ * Copyright (c) 2021, 2024 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 /dts-v1/;
 
 #include <nxp/nxp_imx8.dtsi>
-#include "nxp_adsp_imx8-pinctrl.dtsi"
+#include "mimx8qxp_mek_imx8qxp_adsp-pinctrl.dtsi"
 
 / {
-	model = "nxp_adsp_imx8";
+	model = "NXP i.MX 8QXP Audio DSP";
 	compatible = "nxp";
 
 	chosen {

diff --git a/...xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml → ...mx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.yaml b/...xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml → ...mx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8x
-name: i.MX8X DSP
+identifier: mimx8qxp_mek/imx8qxp/adsp
+name: NXP i.MX 8QXP Audio DSP
 type: mcu
 arch: xtensa
 toolchain:

diff --git a/...a/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig → ...p_mek/mimx8qxp_mek_imx8qxp_adsp_defconfig b/...a/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig → ...p_mek/mimx8qxp_mek_imx8qxp_adsp_defconfig
@@ -3,10 +3,6 @@
 CONFIG_MAIN_STACK_SIZE=3072
 
 # board/soc-related configurations
-CONFIG_SOC_SERIES_NXP_IMX8=y
-CONFIG_SOC_MIMX8QXP_ADSP=y
-CONFIG_BOARD_NXP_ADSP_IMX8X=y
-
 CONFIG_LOG=y
 
 # TODO: maybe move this to SOF?

diff --git a/boards/nxp/mimx8ulp_evk/Kconfig.mimx8ulp_evk b/boards/nxp/mimx8ulp_evk/Kconfig.mimx8ulp_evk
@@ -0,0 +1,7 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MIMX8ULP_EVK
+	select SOC_MIMX8ULP_ADSP if BOARD_MIMX8ULP_EVK_IMX8ULP_ADSP
diff --git a/...egacy/xtensa/nxp_adsp_imx8ulp/board.cmake → boards/nxp/mimx8ulp_evk/board.cmake b/...egacy/xtensa/nxp_adsp_imx8ulp/board.cmake → boards/nxp/mimx8ulp_evk/board.cmake
@@ -1,6 +1,12 @@
+#
+# Copyright (c) 2024 NXP
+#
 # SPDX-License-Identifier: Apache-2.0
+#
 
+if(CONFIG_SOC_MIMX8ULP_ADSP)
 board_set_flasher_ifnset(misc-flasher)
 board_finalize_runner_args(misc-flasher)
 
 board_set_rimage_target(imx8ulp)
+endif()
diff --git a/boards/nxp/mimx8ulp_evk/board.yml b/boards/nxp/mimx8ulp_evk/board.yml
@@ -0,0 +1,8 @@
+board:
+  name: mimx8ulp_evk
+  vendor: nxp
+  socs:
+    - name: imx8ulp
+      variants:
+        - name: adsp
+          cpucluster: ''
diff --git a/...nsa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts → ...imx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.dts b/...nsa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts → ...imx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 NXP
+ * Copyright (c) 2023-2024 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,7 +9,7 @@
 #include <nxp/nxp_imx8ulp.dtsi>
 
 / {
-	model = "nxp_adsp_imx8ulp";
+	model = "NXP i.MX 8ULP Audio DSP";
 	compatible = "nxp";
 
 	chosen {

diff --git a/...sa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml → ...mx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.yaml b/...sa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml → ...mx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8ulp
-name: i.MX8ULP DSP
+identifier: mimx8ulp_evk/imx8ulp/adsp
+name: NXP i.MX 8ULP Audio DSP
 type: mcu
 arch: xtensa
 toolchain:

diff --git a/...p_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig → ...p_evk/mimx8ulp_evk_imx8ulp_adsp_defconfig b/...p_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig → ...p_evk/mimx8ulp_evk_imx8ulp_adsp_defconfig
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NXP_IMX8ULP=y
-CONFIG_SOC_NXP_IMX8ULP=y
-CONFIG_BOARD_NXP_ADSP_IMX8ULP=y
-
 CONFIG_BUILD_OUTPUT_BIN=n
 
 CONFIG_DYNAMIC_INTERRUPTS=y