diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.board deleted file mode 100644 index 4bb4f56404043f0..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2021 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NXP_ADSP_IMX8 - bool "NXP ADSP i.MX8" - depends on SOC_SERIES_NXP_IMX8 - select SOC_PART_NUMBER_MIMX8QM6AVUFF diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.defconfig deleted file mode 100644 index 04aa0aa6ed30e5d..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2021 NXP -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NXP_ADSP_IMX8 - -config BOARD - default "nxp_adsp_imx8" - -endif # BOARD_NXP_ADSP_IMX8 diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.board deleted file mode 100644 index b84a08cc12feb50..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2021 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NXP_ADSP_IMX8M - bool "NXP i.MX8M Plus EVK Audio DSP" - depends on SOC_SERIES_NXP_IMX8M - select SOC_PART_NUMBER_MIMX8ML8DVNLZ - select SOC_PART_NUMBER_MIMX8ML8CVNKZ diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.defconfig deleted file mode 100644 index 344449dd74436b6..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2021, 2023 NXP -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NXP_ADSP_IMX8M - -config BOARD - default "nxp_adsp_imx8m" - -endif # BOARD_NXP_ADSP_IMX8M diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.board deleted file mode 100644 index d9a1ff659532860..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2023 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NXP_ADSP_IMX8ULP - bool "NXP ADSP i.MX8ULP" diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.defconfig deleted file mode 100644 index 431515d5961428d..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2023 NXP -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NXP_ADSP_IMX8ULP - -config BOARD - default "nxp_adsp_imx8ulp" - -endif # BOARD_NXP_ADSP_IMX8ULP diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.board b/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.board deleted file mode 100644 index 7d5336ce7a790ca..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2021 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NXP_ADSP_IMX8X - bool "NXP ADSP i.MX8X" - depends on SOC_SERIES_NXP_IMX8 - select SOC_PART_NUMBER_MIMX8QX6AVLFZ diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.defconfig b/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.defconfig deleted file mode 100644 index a985696286afb9f..000000000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2021 NXP -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NXP_ADSP_IMX8X - -config BOARD - default "nxp_adsp_imx8x" - -endif # BOARD_NXP_ADSP_IMX8X diff --git a/boards/nxp/mimx8mp_evk/Kconfig.mimx8mp_evk b/boards/nxp/mimx8mp_evk/Kconfig.mimx8mp_evk new file mode 100644 index 000000000000000..8a07406b64ae331 --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake b/boards/nxp/mimx8mp_evk/board.cmake similarity index 68% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake rename to boards/nxp/mimx8mp_evk/board.cmake index 4fb52dc2d292fbc..cd7e9d758238ab0 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake +++ b/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 new file mode 100644 index 000000000000000..a0ebaace42af9fc --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts b/boards/nxp/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.dts similarity index 89% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts rename to boards/nxp/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.dts index 6a0d7508deb2a72..dc8c0ab48a5816b 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts +++ b/boards/nxp/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 / { - model = "nxp_adsp_imx8m"; + model = "NXP i.MX 8MPLUS Audio DSP"; compatible = "nxp"; chosen { diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml b/boards/nxp/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.yaml similarity index 70% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml rename to boards/nxp/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp.yaml index ef0bbdfe0ff04ff..0acdd2d260a214a 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml +++ b/boards/nxp/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/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig b/boards/nxp/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp_defconfig similarity index 85% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig rename to boards/nxp/mimx8mp_evk/mimx8mp_evk_imx8mp_adsp_defconfig index 72ccd09f55a47cb..e2c64fa2e0dc076 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig +++ b/boards/nxp/mimx8mp_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 new file mode 100644 index 000000000000000..5271a6e50a21865 --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake b/boards/nxp/mimx8qm_mek/board.cmake similarity index 55% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake rename to boards/nxp/mimx8qm_mek/board.cmake index 7ae22465082ced0..d460d9b8528e4df 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake +++ b/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 new file mode 100644 index 000000000000000..7ead6d75fa8ff81 --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi b/boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi rename to boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp-pinctrl.dtsi diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts b/boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.dts similarity index 74% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts rename to boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.dts index 5aa0e59ebdd0782..7958befd99b6a40 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts +++ b/boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 NXP + * Copyright (c) 2021, 2024 NXP * * SPDX-License-Identifier: Apache-2.0 */ @@ -7,10 +7,10 @@ /dts-v1/; #include -#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/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml b/boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.yaml similarity index 61% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml rename to boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_adsp.yaml index b2ab9b227a9dc94..c1ec30366763871 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml +++ b/boards/nxp/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/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig b/boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_defconfig similarity index 80% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig rename to boards/nxp/mimx8qm_mek/mimx8qm_mek_im8qm_defconfig index a16d8be5e2e36e4..325b05b84e90c58 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig +++ b/boards/nxp/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 new file mode 100644 index 000000000000000..c560576cbbbe147 --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake b/boards/nxp/mimx8qxp_mek/board.cmake similarity index 55% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake rename to boards/nxp/mimx8qxp_mek/board.cmake index 7ae22465082ced0..37750ab21c2e840 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake +++ b/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 new file mode 100644 index 000000000000000..0c98d830cea7944 --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi b/boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi rename to boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp-pinctrl.dtsi diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts b/boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.dts similarity index 74% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts rename to boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.dts index a17690109eca596..b69317a57065b8a 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts +++ b/boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 NXP + * Copyright (c) 2021, 2024 NXP * * SPDX-License-Identifier: Apache-2.0 */ @@ -7,10 +7,10 @@ /dts-v1/; #include -#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/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml b/boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.yaml similarity index 60% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml rename to boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp.yaml index a343b8843c8dccd..3577ee8cc17daba 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml +++ b/boards/nxp/mimx8qxp_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/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig b/boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp_defconfig similarity index 79% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig rename to boards/nxp/mimx8qxp_mek/mimx8qxp_mek_imx8qxp_adsp_defconfig index 0635e78adf88f69..325b05b84e90c58 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig +++ b/boards/nxp/mimx8qxp_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 new file mode 100644 index 000000000000000..5f61386236865a1 --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake b/boards/nxp/mimx8ulp_evk/board.cmake similarity index 69% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake rename to boards/nxp/mimx8ulp_evk/board.cmake index e05fbc891e52026..c8d539a840fecd9 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake +++ b/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 new file mode 100644 index 000000000000000..479103aea0c16d0 --- /dev/null +++ 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/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts b/boards/nxp/mimx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.dts similarity index 70% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts rename to boards/nxp/mimx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.dts index d584097cb0306e6..49ad098fb244771 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts +++ b/boards/nxp/mimx8ulp_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 / { - model = "nxp_adsp_imx8ulp"; + model = "NXP i.MX 8ULP Audio DSP"; compatible = "nxp"; chosen { diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml b/boards/nxp/mimx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.yaml similarity index 56% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml rename to boards/nxp/mimx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp.yaml index e71105631da6f9a..8bc7d4f739b0d85 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml +++ b/boards/nxp/mimx8ulp_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/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig b/boards/nxp/mimx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp_defconfig similarity index 54% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig rename to boards/nxp/mimx8ulp_evk/mimx8ulp_evk_imx8ulp_adsp_defconfig index cc1911c615cfcee..e8d594b3070dac5 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig +++ b/boards/nxp/mimx8ulp_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