hwmv2: boards: intel_adsp: Overhaul board configurations

Rename and join configurations for intel_adsp CAVS and ACE
boards to benefit from HWMv2 shortened names with resulting
names change:

  `intel_adsp_ace15_mtpm` --> `intel_adsp/ace15_mtpm`
  `intel_adsp_ace20_lnl`  --> `intel_adsp/ace20_lnl`

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

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

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)
+if(CONFIG_BOARD_INTEL_ADSP_CAVS25 OR CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH)
+
+  if($ENV{CAVS_OLD_FLASHER})
+    board_set_flasher_ifnset(misc-flasher)
+    board_finalize_runner_args(misc-flasher)
+  endif()
+
+  board_set_flasher_ifnset(intel_adsp)
+
+  set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake")
+
+  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)
+
+  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()
-
-board_set_flasher_ifnset(intel_adsp)
-
-set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake")
-
-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)

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

boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _intel_adsp_ace15:
 
 Intel ADSP ACE 1.5

boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _intel_adsp_cavs25:
 
 Intel ADSP CAVS 2.5

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

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

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()

boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig

@@ -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

boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm

@@ -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

boards/intel/intel_adsp_ace15_mtpm/board.cmake

@@ -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)

boards/intel/intel_adsp_ace15_mtpm/board.yml

@@ -1,5 +0,0 @@
-board:
-  name: intel_adsp_ace15_mtpm
-  vendor: intel
-  socs:
-    - name: ace15_mtpm

boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake

@@ -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")

boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl

@@ -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

boards/intel/intel_adsp_ace20_lnl/board.cmake

@@ -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")

boards/intel/intel_adsp_ace20_lnl/board.yml

@@ -1,5 +0,0 @@
-board:
-  name: intel_adsp_ace20_lnl
-  vendor: intel
-  socs:
-    - name: ace20_lnl