diff --git a/boards/intel/intel_adsp/Kconfig.intel_adsp b/boards/intel/intel_adsp/Kconfig.intel_adsp index f37f54227ed..2e4c9844720 100644 --- a/boards/intel/intel_adsp/Kconfig.intel_adsp +++ b/boards/intel/intel_adsp/Kconfig.intel_adsp @@ -2,4 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_INTEL_ADSP - select SOC_INTEL_CAVS_V25 + select SOC_INTEL_CAVS_V25 if BOARD_INTEL_ADSP_CAVS25 + select SOC_INTEL_CAVS_V25 if BOARD_INTEL_ADSP_CAVS25_TGPH + select SOC_INTEL_ACE15_MTPM if BOARD_INTEL_ADSP_ACE15_MTPM + select SOC_INTEL_ACE20_LNL if BOARD_INTEL_ADSP_ACE20_LNL diff --git a/boards/intel/intel_adsp/board.cmake b/boards/intel/intel_adsp/board.cmake index 1bdb2698c12..bcdfc328646 100644 --- a/boards/intel/intel_adsp/board.cmake +++ b/boards/intel/intel_adsp/board.cmake @@ -1,20 +1,42 @@ +# Copyright (c) 2022-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 -if($ENV{CAVS_OLD_FLASHER}) - board_set_flasher_ifnset(misc-flasher) - board_finalize_runner_args(misc-flasher) -endif() +if(CONFIG_BOARD_INTEL_ADSP_CAVS25 OR CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) -board_set_flasher_ifnset(intel_adsp) + if($ENV{CAVS_OLD_FLASHER}) + board_set_flasher_ifnset(misc-flasher) + board_finalize_runner_args(misc-flasher) + endif() -set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake") + board_set_flasher_ifnset(intel_adsp) -if(CONFIG_BOARD_INTEL_ADSP_CAVS25) -board_set_rimage_target(tgl) -endif() + set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake") -if(CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) -board_set_rimage_target(tgl-h) -endif() + if(CONFIG_BOARD_INTEL_ADSP_CAVS25) + board_set_rimage_target(tgl) + endif() + + if(CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) + board_set_rimage_target(tgl-h) + endif() + + board_finalize_runner_args(intel_adsp) + +elseif(CONFIG_BOARD_INTEL_ADSP_ACE15_MTPM) + + board_set_rimage_target(mtl) -board_finalize_runner_args(intel_adsp) + set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace15_mtpm/board.cmake") + + board_finalize_runner_args(intel_adsp) + +elseif(CONFIG_BOARD_INTEL_ADSP_ACE20_LNL) + + set(SUPPORTED_EMU_PLATFORMS acesim) + + board_set_rimage_target(lnl) + + set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace20_lnl/board.cmake") + +endif() diff --git a/boards/intel/intel_adsp/board.yml b/boards/intel/intel_adsp/board.yml index cb496cd3346..9295ae0c3eb 100644 --- a/boards/intel/intel_adsp/board.yml +++ b/boards/intel/intel_adsp/board.yml @@ -1,7 +1,9 @@ -board: - name: intel_adsp - vendor: intel - socs: - - name: cavs25 - variants: - - name: 'tgph' +boards: + - name: intel_adsp + vendor: intel + socs: + - name: cavs25 + variants: + - name: 'tgph' + - name: ace15_mtpm + - name: ace20_lnl diff --git a/boards/intel/intel_adsp_ace15_mtpm/doc/index.rst b/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst similarity index 99% rename from boards/intel/intel_adsp_ace15_mtpm/doc/index.rst rename to boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst index d31783cd944..f1f7b77de0d 100644 --- a/boards/intel/intel_adsp_ace15_mtpm/doc/index.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst @@ -1,3 +1,5 @@ +:orphan: + .. _intel_adsp_ace15: Intel ADSP ACE 1.5 diff --git a/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst b/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst index 437560562e0..df60b4f4646 100644 --- a/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst @@ -1,3 +1,5 @@ +:orphan: + .. _intel_adsp_cavs25: Intel ADSP CAVS 2.5 diff --git a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm.dts similarity index 100% rename from boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts rename to boards/intel/intel_adsp/intel_adsp_ace15_mtpm.dts diff --git a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm.yaml similarity index 84% rename from boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml rename to boards/intel/intel_adsp/intel_adsp_ace15_mtpm.yaml index 9493e4c08da..3449cda35f7 100644 --- a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml +++ b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_ace15_mtpm +identifier: intel_adsp/ace15_mtpm name: ACE 1.5 MTL M Audio DSP type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm_defconfig similarity index 100% rename from boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig rename to boards/intel/intel_adsp/intel_adsp_ace15_mtpm_defconfig diff --git a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts b/boards/intel/intel_adsp/intel_adsp_ace20_lnl.dts similarity index 100% rename from boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts rename to boards/intel/intel_adsp/intel_adsp_ace20_lnl.dts diff --git a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml b/boards/intel/intel_adsp/intel_adsp_ace20_lnl.yaml similarity index 85% rename from boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml rename to boards/intel/intel_adsp/intel_adsp_ace20_lnl.yaml index 693f3ad2ce6..47a02563654 100644 --- a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml +++ b/boards/intel/intel_adsp/intel_adsp_ace20_lnl.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_ace20_lnl +identifier: intel_adsp/ace20_lnl name: ACE 2.0 LNL Audio DSP type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig b/boards/intel/intel_adsp/intel_adsp_ace20_lnl_defconfig similarity index 100% rename from boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig rename to boards/intel/intel_adsp/intel_adsp_ace20_lnl_defconfig diff --git a/boards/intel/intel_adsp/pre_dt_board.cmake b/boards/intel/intel_adsp/pre_dt_board.cmake index 7a471ca8758..9a917df707b 100644 --- a/boards/intel/intel_adsp/pre_dt_board.cmake +++ b/boards/intel/intel_adsp/pre_dt_board.cmake @@ -1,6 +1,10 @@ # Copyright (c) 2022 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +if(NOT CONFIG_BOARD_INTEL_ADSP_ACE20_LNL) + # Suppress "unique_unit_address_if_enabled" to handle the following overlaps: # - dmic0: dmic0@10000 & dmic1: dmic1@10000 list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") + +endif() diff --git a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig deleted file mode 100644 index 3408fb44a46..00000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2022-2024 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -if DAI_INTEL_SSP - -config DAI_SSP_HAS_POWER_CONTROL - def_bool y - -endif diff --git a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm deleted file mode 100644 index 2fa6580f6a4..00000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022-2024 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE15_MTPM - bool - select SOC_INTEL_ACE15_MTPM diff --git a/boards/intel/intel_adsp_ace15_mtpm/board.cmake b/boards/intel/intel_adsp_ace15_mtpm/board.cmake deleted file mode 100644 index e9778da4d84..00000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/board.cmake +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -board_set_rimage_target(mtl) - -set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace15_mtpm/board.cmake") - -board_finalize_runner_args(intel_adsp) diff --git a/boards/intel/intel_adsp_ace15_mtpm/board.yml b/boards/intel/intel_adsp_ace15_mtpm/board.yml deleted file mode 100644 index 61857a04c40..00000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: intel_adsp_ace15_mtpm - vendor: intel - socs: - - name: ace15_mtpm diff --git a/boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake b/boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake deleted file mode 100644 index 7a471ca8758..00000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - dmic0: dmic0@10000 & dmic1: dmic1@10000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl b/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl deleted file mode 100644 index 49b40b941d1..00000000000 --- a/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2022-2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE20_LNL - select SOC_INTEL_ACE20_LNL diff --git a/boards/intel/intel_adsp_ace20_lnl/board.cmake b/boards/intel/intel_adsp_ace20_lnl/board.cmake deleted file mode 100644 index 04d679fba02..00000000000 --- a/boards/intel/intel_adsp_ace20_lnl/board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -set(SUPPORTED_EMU_PLATFORMS acesim) - -board_set_rimage_target(lnl) - -set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace20_lnl/board.cmake") diff --git a/boards/intel/intel_adsp_ace20_lnl/board.yml b/boards/intel/intel_adsp_ace20_lnl/board.yml deleted file mode 100644 index 6b3b748c795..00000000000 --- a/boards/intel/intel_adsp_ace20_lnl/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: intel_adsp_ace20_lnl - vendor: intel - socs: - - name: ace20_lnl