Browse Source

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

Convert i.MX ADSP boards to HMV2 including:
- imx8mp_evk
- imx8qxp_mek
- imx8qm_mek
- imx8ulp_evk

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
pull/69687/head
Iuliana Prodan 1 year ago committed by Carles Cufi
parent
commit
39b31287d9
  1. 9
      boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.board
  2. 10
      boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.defconfig
  3. 6
      boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake
  4. 10
      boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.board
  5. 10
      boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.defconfig
  6. 6
      boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake
  7. 7
      boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.board
  8. 10
      boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.defconfig
  9. 6
      boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake
  10. 9
      boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.board
  11. 10
      boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.defconfig
  12. 6
      boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake
  13. 5
      boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk
  14. 11
      boards/nxp/imx8mp_evk/board.cmake
  15. 4
      boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.dts
  16. 4
      boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.yaml
  17. 4
      boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp_defconfig
  18. 8
      boards/nxp/imx8qm_mek/Kconfig.imx8qm_mek
  19. 12
      boards/nxp/imx8qm_mek/board.cmake
  20. 5
      boards/nxp/imx8qm_mek/board.yml
  21. 0
      boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi
  22. 6
      boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.dts
  23. 4
      boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.yaml
  24. 4
      boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_defconfig
  25. 8
      boards/nxp/imx8qxp_mek/Kconfig.imx8qxp_mek
  26. 12
      boards/nxp/imx8qxp_mek/board.cmake
  27. 5
      boards/nxp/imx8qxp_mek/board.yml
  28. 0
      boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi
  29. 6
      boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.dts
  30. 4
      boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.yaml
  31. 4
      boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp_defconfig
  32. 7
      boards/nxp/imx8ulp_evk/Kconfig.imx8ulp_evk
  33. 12
      boards/nxp/imx8ulp_evk/board.cmake
  34. 5
      boards/nxp/imx8ulp_evk/board.yml
  35. 4
      boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.dts
  36. 4
      boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml
  37. 4
      boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp_defconfig

9
boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.board

@ -1,9 +0,0 @@ @@ -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

10
boards/boards_legacy/xtensa/nxp_adsp_imx8/Kconfig.defconfig

@ -1,10 +0,0 @@ @@ -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

6
boards/boards_legacy/xtensa/nxp_adsp_imx8/board.cmake

@ -1,6 +0,0 @@ @@ -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)

10
boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.board

@ -1,10 +0,0 @@ @@ -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

10
boards/boards_legacy/xtensa/nxp_adsp_imx8m/Kconfig.defconfig

@ -1,10 +0,0 @@ @@ -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

6
boards/boards_legacy/xtensa/nxp_adsp_imx8m/board.cmake

@ -1,6 +0,0 @@ @@ -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)

7
boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.board

@ -1,7 +0,0 @@ @@ -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"

10
boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/Kconfig.defconfig

@ -1,10 +0,0 @@ @@ -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

6
boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/board.cmake

@ -1,6 +0,0 @@ @@ -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)

9
boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.board

@ -1,9 +0,0 @@ @@ -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

10
boards/boards_legacy/xtensa/nxp_adsp_imx8x/Kconfig.defconfig

@ -1,10 +0,0 @@ @@ -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

6
boards/boards_legacy/xtensa/nxp_adsp_imx8x/board.cmake

@ -1,6 +0,0 @@ @@ -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)

5
boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk

@ -1,6 +1,7 @@ @@ -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

11
boards/nxp/imx8mp_evk/board.cmake

@ -1 +1,12 @@ @@ -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()

4
boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.dts → boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.dts

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2021, 2023 NXP
* Copyright 2021, 2023, 2024 NXP
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -10,7 +10,7 @@ @@ -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 {

4
boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m.yaml → boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp.yaml

@ -1,5 +1,5 @@ @@ -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:

4
boards/boards_legacy/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig → boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_adsp_defconfig

@ -1,9 +1,5 @@ @@ -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

8
boards/nxp/imx8qm_mek/Kconfig.imx8qm_mek

@ -0,0 +1,8 @@ @@ -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

12
boards/nxp/imx8qm_mek/board.cmake

@ -0,0 +1,12 @@ @@ -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()

5
boards/nxp/imx8qm_mek/board.yml

@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
board:
name: imx8qm_mek
vendor: nxp
socs:
- name: mimx8qm6

0
boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8-pinctrl.dtsi → boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp-pinctrl.dtsi

6
boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.dts → boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.dts

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 NXP
* Copyright (c) 2021, 2024 NXP
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
/dts-v1/;
#include <nxp/nxp_imx8.dtsi>
#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 {

4
boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8.yaml → boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_adsp.yaml

@ -1,5 +1,5 @@ @@ -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:

4
boards/boards_legacy/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig → boards/nxp/imx8qm_mek/imx8qm_mek_mimx8qm6_defconfig

@ -3,10 +3,6 @@ @@ -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?

8
boards/nxp/imx8qxp_mek/Kconfig.imx8qxp_mek

@ -0,0 +1,8 @@ @@ -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

12
boards/nxp/imx8qxp_mek/board.cmake

@ -0,0 +1,12 @@ @@ -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()

5
boards/nxp/imx8qxp_mek/board.yml

@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
board:
name: imx8qxp_mek
vendor: nxp
socs:
- name: mimx8qx6

0
boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x-pinctrl.dtsi → boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp-pinctrl.dtsi

6
boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.dts → boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.dts

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 NXP
* Copyright (c) 2021, 2024 NXP
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
/dts-v1/;
#include <nxp/nxp_imx8.dtsi>
#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 {

4
boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x.yaml → boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp.yaml

@ -1,5 +1,5 @@ @@ -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:

4
boards/boards_legacy/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig → boards/nxp/imx8qxp_mek/imx8qxp_mek_mimx8qx6_adsp_defconfig

@ -3,10 +3,6 @@ @@ -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?

7
boards/nxp/imx8ulp_evk/Kconfig.imx8ulp_evk

@ -0,0 +1,7 @@ @@ -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

12
boards/nxp/imx8ulp_evk/board.cmake

@ -0,0 +1,12 @@ @@ -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()

5
boards/nxp/imx8ulp_evk/board.yml

@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
board:
name: imx8ulp_evk
vendor: nxp
socs:
- name: imx8ulp

4
boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.dts → boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.dts

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 NXP
* Copyright (c) 2023-2024 NXP
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
#include <nxp/nxp_imx8ulp.dtsi>
/ {
model = "nxp_adsp_imx8ulp";
model = "NXP i.MX 8ULP Audio DSP";
compatible = "nxp";
chosen {

4
boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp.yaml → boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml

@ -1,5 +1,5 @@ @@ -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:

4
boards/boards_legacy/xtensa/nxp_adsp_imx8ulp/nxp_adsp_imx8ulp_defconfig → boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp_defconfig

@ -1,9 +1,5 @@ @@ -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
Loading…
Cancel
Save