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 4bb4f564040..00000000000 --- 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 04aa0aa6ed3..00000000000 --- 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_imx8/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake deleted file mode 100644 index 7ae22465082..00000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) - -board_set_rimage_target(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 b84a08cc12f..00000000000 --- 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 344449dd744..00000000000 --- 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_imx8m/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake deleted file mode 100644 index 4fb52dc2d29..00000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) - -board_set_rimage_target(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 d9a1ff65953..00000000000 --- 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 431515d5961..00000000000 --- 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_imx8ulp/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake deleted file mode 100644 index e05fbc891e5..00000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) - -board_set_rimage_target(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 7d5336ce7a7..00000000000 --- 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 a985696286a..00000000000 --- 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/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake b/boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake deleted file mode 100644 index 7ae22465082..00000000000 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) - -board_set_rimage_target(imx8) diff --git a/boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk b/boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk index c8ea5ac4552..620d59828a3 100644 --- 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 index 9881313609a..ca181c922bd 100644 --- 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/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts b/boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.dts similarity index 89% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts rename to boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.dts index 6a0d7508deb..dc8c0ab48a5 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts +++ b/boards/nxp/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 / { - 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/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.yaml similarity index 70% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml rename to boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.yaml index ef0bbdfe0ff..78668aa26f6 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml +++ b/boards/nxp/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/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig b/boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp_defconfig similarity index 85% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig rename to boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp_defconfig index 72ccd09f55a..e2c64fa2e0d 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig +++ b/boards/nxp/imx8mp_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 new file mode 100644 index 00000000000..f70580b800c --- /dev/null +++ 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 new file mode 100644 index 00000000000..0924bf99eec --- /dev/null +++ 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 new file mode 100644 index 00000000000..d044277a622 --- /dev/null +++ b/boards/nxp/imx8qm_mek/board.yml @@ -0,0 +1,5 @@ +board: + name: imx8qm_mek + vendor: nxp + socs: + - name: mimx8qm6 diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi b/boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi rename to boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts b/boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.dts similarity index 74% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts rename to boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.dts index a17690109ec..325e293851f 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts +++ b/boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_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 "imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi" / { - model = "nxp_adsp_imx8"; + 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/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.yaml similarity index 60% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml rename to boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.yaml index b2ab9b227a9..c2a70b2652d 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml +++ b/boards/nxp/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/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig b/boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_defconfig similarity index 80% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig rename to boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_defconfig index a16d8be5e2e..325b05b84e9 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig +++ b/boards/nxp/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 new file mode 100644 index 00000000000..fbd35d46b2f --- /dev/null +++ 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 new file mode 100644 index 00000000000..699964c5e39 --- /dev/null +++ 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 new file mode 100644 index 00000000000..e31754086d7 --- /dev/null +++ b/boards/nxp/imx8qxp_mek/board.yml @@ -0,0 +1,5 @@ +board: + name: imx8qxp_mek + vendor: nxp + socs: + - name: mimx8qx6 diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi b/boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi rename to boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts b/boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.dts similarity index 74% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts rename to boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.dts index 5aa0e59ebdd..24a9ee09d9e 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts +++ b/boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_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 "imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi" / { - model = "nxp_adsp_imx8x"; + 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/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.yaml similarity index 60% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml rename to boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.yaml index a343b8843c8..4f168ada93e 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml +++ b/boards/nxp/imx8qxp_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/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig b/boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp_defconfig similarity index 79% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig rename to boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp_defconfig index 0635e78adf8..325b05b84e9 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig +++ b/boards/nxp/imx8qxp_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 new file mode 100644 index 00000000000..dbf611081ab --- /dev/null +++ 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 new file mode 100644 index 00000000000..97e0a80ba04 --- /dev/null +++ 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 new file mode 100644 index 00000000000..b401615d7d7 --- /dev/null +++ b/boards/nxp/imx8ulp_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: imx8ulp_evk + vendor: nxp + socs: + - name: imx8ulp diff --git a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts b/boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.dts similarity index 70% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts rename to boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.dts index d584097cb03..49ad098fb24 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts +++ b/boards/nxp/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 / { - 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/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml similarity index 57% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml rename to boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml index e71105631da..437d112ee58 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml +++ b/boards/nxp/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/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig b/boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp_defconfig similarity index 54% rename from boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig rename to boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp_defconfig index cc1911c615c..e8d594b3070 100644 --- a/boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig +++ b/boards/nxp/imx8ulp_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