zephyrproject-rtos · nordicjm · Feb 28, 2024 · Feb 27, 2024 · Feb 27, 2024 · Feb 23, 2024
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_imx8/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake
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_imx8m/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake
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_imx8ulp/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake
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/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake
diff --git a/boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk b/boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk
@@ -1,6 +1,7 @@
-# Copyright 2021-2022,2024 NXP
+# Copyright 2021-2022, 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_IMX8MP_EVK
 	select SOC_MIMX8ML8_A53 if BOARD_IMX8MP_EVK_MIMX8ML8_A53 || BOARD_IMX8MP_EVK_MIMX8ML8_A53_SMP
-	select SOC_PART_NUMBER_MIMX8ML8DVNLZ if BOARD_IMX8MP_EVK_MIMX8ML8_A53 || BOARD_IMX8MP_EVK_MIMX8ML8_A53_SMP
+	select SOC_MIMX8MP_ADSP if BOARD_IMX8MP_EVK_MIMX8ML8_ADSP
+	select SOC_PART_NUMBER_MIMX8ML8DVNLZ
diff --git a/boards/nxp/imx8mp_evk/board.cmake b/boards/nxp/imx8mp_evk/board.cmake
@@ -1 +1,12 @@
+#
+# Copyright (c) 2024 NXP
+#
 # SPDX-License-Identifier: Apache-2.0
+#
+
+if(CONFIG_SOC_MIMX8MP_ADSP)
+  board_set_flasher_ifnset(misc-flasher)
+  board_finalize_runner_args(misc-flasher)
+
+  board_set_rimage_target(imx8m)
+endif()
diff --git a/.../xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts → ...p/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.dts b/.../xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts → ...p/imx8mp_evk/imx8mp_evk_mimx8ml8_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 → .../imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.yaml b/...xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml → .../imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8m
-name: NXP i.MX8M Plus EVK Audio DSP
+identifier: imx8mp_evk/mimx8ml8/adsp
+name: NXP i.MX 8MPLUS Audio DSP
 type: mcu
 arch: xtensa
 toolchain:

diff --git a/...a/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig → ...mp_evk/imx8mp_evk_mimx8ml8_adsp_defconfig b/...a/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig → ...mp_evk/imx8mp_evk_mimx8ml8_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/imx8qm_mek/Kconfig.imx8qm_mek b/boards/nxp/imx8qm_mek/Kconfig.imx8qm_mek
@@ -0,0 +1,8 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_IMX8QM_MEK
+	select SOC_MIMX8QM_ADSP if BOARD_IMX8QM_MEK_MIMX8QM6_ADSP
+	select SOC_PART_NUMBER_MIMX8QM6AVUFF
diff --git a/boards/nxp/imx8qm_mek/board.cmake b/boards/nxp/imx8qm_mek/board.cmake
@@ -0,0 +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(imx)
+endif()
diff --git a/boards/nxp/imx8qm_mek/board.yml b/boards/nxp/imx8qm_mek/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: imx8qm_mek
+  vendor: nxp
+  socs:
+    - name: mimx8qm6
diff --git a/.../nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi → ...mek/imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi b/.../nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi → ...mek/imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi
diff --git a/.../xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts → ...p/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.dts b/.../xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts → ...p/imx8qm_mek/imx8qm_mek_mimx8qm6_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 "imx8qm_mek_mimx8qm6_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 → .../imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.yaml b/...y/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml → .../imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8
-name: i.MX8 DSP
+identifier: imx8qm_mek/mimx8qm6/adsp
+name: NXP i.MX 8QM Audio DSP
 type: mcu
 arch: xtensa
 toolchain:

diff --git a/...nsa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig → .../imx8qm_mek/imx8qm_mek_mimx8qm6_defconfig b/...nsa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig → .../imx8qm_mek/imx8qm_mek_mimx8qm6_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/imx8qxp_mek/Kconfig.imx8qxp_mek b/boards/nxp/imx8qxp_mek/Kconfig.imx8qxp_mek
@@ -0,0 +1,8 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_IMX8QXP_MEK
+	select SOC_MIMX8QXP_ADSP if BOARD_IMX8QXP_MEK_MIMX8QX6_ADSP
+	select SOC_PART_NUMBER_MIMX8QX6AVLFZ
diff --git a/boards/nxp/imx8qxp_mek/board.cmake b/boards/nxp/imx8qxp_mek/board.cmake
@@ -0,0 +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(imx)
+endif()
diff --git a/boards/nxp/imx8qxp_mek/board.yml b/boards/nxp/imx8qxp_mek/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: imx8qxp_mek
+  vendor: nxp
+  socs:
+    - name: mimx8qx6
diff --git a/...xp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi → ...ek/imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi b/...xp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi → ...ek/imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi
diff --git a/...cy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts → ...imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.dts b/...cy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts → ...imx8qxp_mek/imx8qxp_mek_mimx8qx6_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 "imx8qxp_mek_mimx8qx6_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/imx8qxp_mek_mimx8qx6_adsp.yaml b/...xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml → ...mx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8x
-name: i.MX8X DSP
+identifier: imx8qxp_mek/mimx8qx6/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/imx8qxp_mek_mimx8qx6_adsp_defconfig b/...a/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig → ...p_mek/imx8qxp_mek_mimx8qx6_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/imx8ulp_evk/Kconfig.imx8ulp_evk b/boards/nxp/imx8ulp_evk/Kconfig.imx8ulp_evk
@@ -0,0 +1,7 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_IMX8ULP_EVK
+	select SOC_MIMX8ULP_ADSP if BOARD_IMX8ULP_EVK_IMX8ULP_ADSP
diff --git a/boards/nxp/imx8ulp_evk/board.cmake b/boards/nxp/imx8ulp_evk/board.cmake
@@ -0,0 +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/imx8ulp_evk/board.yml b/boards/nxp/imx8ulp_evk/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: imx8ulp_evk
+  vendor: nxp
+  socs:
+    - name: imx8ulp
diff --git a/...nsa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts → .../imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.dts b/...nsa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts → .../imx8ulp_evk/imx8ulp_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 → ...imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml b/...sa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml → ...imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml
@@ -1,5 +1,5 @@
-identifier: nxp_adsp_imx8ulp
-name: i.MX8ULP DSP
+identifier: imx8ulp_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 → ...lp_evk/imx8ulp_evk_imx8ulp_adsp_defconfig b/...p_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig → ...lp_evk/imx8ulp_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

diff --git a/modules/Kconfig.imx b/modules/Kconfig.imx
@@ -6,7 +6,7 @@
 config HAS_IMX_HAL
 	bool
 	select HAS_CMSIS_CORE
-	depends on SOC_FAMILY_IMX
+	depends on SOC_FAMILY_NXP_IMX || SOC_FAMILY_IMX
 
 if HAS_IMX_HAL
 

diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux
@@ -5,9 +5,8 @@
 
 config HAS_MCUX
 	bool
-	depends on SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC || \
-		SOC_FAMILY_NXP_ADSP || SOC_FAMILY_NXP_S32 || SOC_FAMILY_NXP_IMXRT
-
+	depends on SOC_FAMILY_KINETIS || SOC_FAMILY_NXP_IMX || SOC_FAMILY_LPC || \
+		SOC_FAMILY_NXP_S32 || SOC_FAMILY_IMX || SOC_FAMILY_NXP_IMXRT
 if HAS_MCUX
 
 config MCUX_CORE_SUFFIX

diff --git a/...namp_rsc_table/boards/nxp_adsp_imx8m.conf → ...able/boards/imx8mp_evk_mimx8ml8_adsp.conf b/...namp_rsc_table/boards/nxp_adsp_imx8m.conf → ...able/boards/imx8mp_evk_mimx8ml8_adsp.conf
diff --git a/...p_rsc_table/boards/nxp_adsp_imx8m.overlay → ...e/boards/imx8mp_evk_mimx8ml8_adsp.overlay b/...p_rsc_table/boards/nxp_adsp_imx8m.overlay → ...e/boards/imx8mp_evk_mimx8ml8_adsp.overlay
diff --git a/samples/subsys/ipc/openamp_rsc_table/sample.yaml b/samples/subsys/ipc/openamp_rsc_table/sample.yaml
@@ -7,8 +7,8 @@ tests:
     build_only: true
     platform_allow:
       - stm32mp157c_dk2
-      - nxp_adsp_imx8m
+      - imx8mp_evk/mimx8ml8/adsp
     integration_platforms:
       - stm32mp157c_dk2
-      - nxp_adsp_imx8m
+      - imx8mp_evk/mimx8ml8/adsp
     tags: ipm