boards: xtensa: intel_adsp_cavs25: move and convert to HWMv2

Move and convert to HWMv2 intel_adsp_cavs25 board configuration.

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

boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.board

@@ -1,12 +0,0 @@
-# Xtensa board configuration
-
-# Copyright (c) 2020 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-config  BOARD_INTEL_ADSP_CAVS25
-	bool "Intel ADSP CAVS 2.5"
-	depends on SOC_SERIES_INTEL_ADSP_CAVS
-
-config  BOARD_INTEL_ADSP_CAVS25_TGPH
-	bool "Intel ADSP CAVS 2.5 for Tiger Lake H PCH"
-	depends on SOC_SERIES_INTEL_ADSP_CAVS

boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.defconfig

@@ -1,20 +0,0 @@
-# Copyright (c) 2020 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH
-
-config BOARD
-	default "intel_adsp_cavs25" if BOARD_INTEL_ADSP_CAVS25
-	default "intel_adsp_cavs25_tgph" if BOARD_INTEL_ADSP_CAVS25_TGPH
-
-
-
-if DAI_INTEL_SSP
-
-config DAI_SSP_HAS_POWER_CONTROL
-	def_bool y
-
-endif
-
-endif # BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH

boards/intel/intel_adsp_cavs25/Kconfig.defconfig

@@ -0,0 +1,10 @@
+# Copyright (c) 2020-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_cavs25/Kconfig.intel_adsp_cavs25

@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_INTEL_ADSP_CAVS25
+	select SOC_INTEL_CAVS_V25

boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph

@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_INTEL_ADSP_CAVS25_TGPH
+	select SOC_INTEL_CAVS_V25

boards/intel/intel_adsp_cavs25/board.yml

@@ -0,0 +1,11 @@
+boards:
+
+  - name: intel_adsp_cavs25
+    vendor: intel
+    socs:
+      - name: intel_tgl_adsp
+
+  - name: intel_adsp_cavs25_tgph
+    vendor: intel
+    socs:
+      - name: intel_tgl_adsp

boards/intel/intel_adsp_cavs25/doc/chromebooks_adsp.rst

@@ -366,7 +366,7 @@ the Crouton environment installed above.  Copy them:
 
 .. code-block:: console
 
-    dev$ scp soc/xtensa/intel_adsp/tools/cavstool.py user@crouton:
+    dev$ scp soc/intel/intel_adsp/tools/cavstool.py user@crouton:
 
 Then start the service in the Crouton environment:
 

boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst

@@ -141,7 +141,7 @@ undocumented rimage precedence rules it's best to use only one way at a time.
 
 - For board-specific needs you can define WEST_SIGN_OPTS in
   ``boards/my/board/board.cmake``, see example in
-  ``soc/xtensa/intel_adsp/common/CMakeLists.txt``
+  ``soc/intel/intel_adsp/common/CMakeLists.txt``
 
 Starting with Zephyr 3.6.0, ``west flash`` does not invoke ``west sign``
 anymore and you cannot pass rimage parameters to ``west flash`` anymore. To
@@ -162,16 +162,16 @@ this point onward, we will refer to the board as the "remote host" and your
 development machine as the "local host".
 
 Copy the below scripts to the cAVS board.
-:zephyr_file:`soc/xtensa/intel_adsp/tools/remote-fw-service.py` will receive
+:zephyr_file:`soc/intel/intel_adsp/tools/remote-fw-service.py` will receive
 the binary sent over the network by West and invoke
-:zephyr_file:`soc/xtensa/intel_adsp/tools/cavstool.py` (referred to as the
+:zephyr_file:`soc/intel/intel_adsp/tools/cavstool.py` (referred to as the
 "cAVS tool"), which performs the flash and captures the log. Start
 :file:`remote-fw-service.py`.
 
 .. code-block:: console
 
-   scp -r $ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstool.py username@remotehostname
-   scp -r $ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/remote-fw-service.py username@remotehostname
+   scp -r $ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool.py username@remotehostname
+   scp -r $ZEPHYR_BASE/soc/intel/intel_adsp/tools/remote-fw-service.py username@remotehostname
    ssh username@remotehostname
    sudo ./remote-fw-service.py
 
@@ -179,7 +179,7 @@ the binary sent over the network by West and invoke
 communicate. It forwards logs collected by :file:`cavstool.py` on port 9999
 (referred to as its "log port") and services requests on port 10000
 (its "requests port"). When you run West or Twister on your local host,
-it sends requests using the :zephyr_file:`soc/xtensa/intel_adsp/tools/cavstool_client.py`
+it sends requests using the :zephyr_file:`soc/intel/intel_adsp/tools/cavstool_client.py`
 script (referred to as "cAVS tool client"). It also uses ports 9999 and 10000 on
 your local host, so be sure those ports are free.
 
@@ -193,7 +193,7 @@ Running tests with Twister is slightly more complicated.
 
 .. code-block:: console
 
-   twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstool_client.py,-s,remotehostname,-l" --west-flash="--remote-host=remotehostname" -T samples/hello_world
+   twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname,-l" --west-flash="--remote-host=remotehostname" -T samples/hello_world
 
 If your network is set up such that the TCP connection from
 :file:`cavstool_client.py` to :file:`remote-fw-service.py` is forwarded through
@@ -204,7 +204,7 @@ the port numbers to the intermediate host name.
 .. code-block:: console
 
    west flash --remote-host intermediatehost:reqport --pty remotehostname:logport
-   twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" --west-flash="--remote-host=remotehostname:reqport" -T samples/hello_world
+   twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" --west-flash="--remote-host=remotehostname:reqport" -T samples/hello_world
 
 You can also save this information to a hardware map file and pass that to
 Twister.
@@ -222,7 +222,7 @@ Here's a sample ``cavs.map``:
      platform: intel_adsp_cavs25
      product: None
      runner: intel_adsp
-     serial_pty: "/home/zephyrus/zephyrproject/zephyr/soc/xtensa/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l"
+     serial_pty: "/home/zephyrus/zephyrproject/zephyr/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l"
      runner_params:
      - --remote-host=remotehostname:reqport
 

boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig

@@ -2,10 +2,6 @@
 
 CONFIG_MAIN_STACK_SIZE=2048
 
-CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y
-CONFIG_SOC_INTEL_CAVS_V25=y
-CONFIG_BOARD_INTEL_ADSP_CAVS25=y
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 

boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig

@@ -2,11 +2,6 @@
 
 CONFIG_MAIN_STACK_SIZE=2048
 
-CONFIG_SOC_INTEL_CAVS_V25=y
-CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH=y
-CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y
-
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n