boards: Convert arduino_giga_r1 to HWM v2

Port the board to HWMv2.

Signed-off-by: Erwan Gouriou <erwan.gouriou@st.com>

boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1

@@ -0,0 +1,6 @@
+# Copyright 2023 Google LLC
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ARDUINO_GIGA_R1
+	select SOC_STM32H747XX_M7 if BOARD_ARDUINO_GIGA_R1_STM32H747XX_M7
+	select SOC_STM32H747XX_M4 if BOARD_ARDUINO_GIGA_R1_STM32H747XX_M4

boards/arduino/arduino_giga_r1/Kconfig.defconfig

@@ -0,0 +1,18 @@
+# Copyright 2023 Google LLC
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_ARDUINO_GIGA_R1
+
+if BT
+
+choice AIROC_PART
+	default CYW4343W
+endchoice
+
+choice CYW4343W_MODULE
+	default CYW4343W_MURATA_1DX
+endchoice
+
+endif # BT
+
+endif # BOARD_ARDUINO_GIGA_R1

boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.yaml

@@ -1,4 +1,4 @@
-identifier: arduino_giga_r1_m4
+identifier: arduino_giga_r1/stm32h747xx/m4
 name: Arduino GIGA R1 WiFi (M4)
 type: mcu
 arch: arm

boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4_defconfig

@@ -1,12 +1,6 @@
 # Copyright 2023 Google LLC
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32H7X=y
-CONFIG_SOC_STM32H747XX=y
-
-# Board config should be specified since there are 2 possible targets
-CONFIG_BOARD_ARDUINO_GIGA_R1_M4=y
-
 # Enable GPIO
 CONFIG_GPIO=y
 

boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.yaml

@@ -1,4 +1,4 @@
-identifier: arduino_giga_r1_m7
+identifier: arduino_giga_r1/stm32h747xx/m7
 name: Arduino GIGA R1 WiFi (M7)
 type: mcu
 arch: arm

boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7_defconfig

@@ -1,12 +1,6 @@
 # Copyright 2023 Google LLC
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32H7X=y
-CONFIG_SOC_STM32H747XX=y
-
-# Board config should be specified since there are 2 possible targets
-CONFIG_BOARD_ARDUINO_GIGA_R1_M7=y
-
 # Disable the internal SMPS regulator
 CONFIG_POWER_SUPPLY_DIRECT_SMPS=n
 

boards/arduino/arduino_giga_r1/board.cmake

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_ARDUINO_GIGA_R1_M7)
+if(CONFIG_BOARD_ARDUINO_GIGA_R1_STM32H747XX_M7)
 board_runner_args(jlink "--device=STM32H747XI_M7" "--speed=4000")
 board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_arduino_giga_r1_m7.cfg")
 board_runner_args(openocd --target-handle=_CHIPNAME.cpu0)
-elseif(CONFIG_BOARD_ARDUINO_GIGA_R1_M4)
+elseif(CONFIG_BOARD_ARDUINO_GIGA_R1_STM32H747XX_M4)
 board_runner_args(jlink "--device=STM32H747XI_M4" "--speed=4000")
 board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_arduino_giga_r1_m4.cfg")
 board_runner_args(openocd --target-handle=_CHIPNAME.cpu1)

boards/arduino/arduino_giga_r1/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: arduino_giga_r1
+  vendor: arduino
+  socs:
+    - name: stm32h747xx

boards/arduino/arduino_giga_r1/doc/index.rst

@@ -103,7 +103,7 @@ Programming and Debugging
 *************************
 
 Applications for the ``arduino_giga_r1`` board should be built per core target,
-using either ``arduino_giga_r1_m7`` or ``arduino_giga_r1_m4`` as the target.
+using either ``arduino_giga_r1/stm32h747xx/m7`` or ``arduino_giga_r1/stm32h747xx/m4`` as the target.
 
 See :ref:`build_an_application` for more information about application builds.
 
@@ -134,7 +134,7 @@ Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: arduino_giga_r1_m7
+   :board: arduino_giga_r1/stm32h747xx/m7
    :goals: build flash
 
 Run a serial host program to connect with your board:
@@ -147,7 +147,7 @@ You should see the following message on the console:
 
 .. code-block:: console
 
-   Hello World! arduino_giga_r1_m7
+   Hello World! arduino_giga_r1
 
 Similarly, you can build and flash samples on the M4 target.
 
@@ -155,7 +155,7 @@ Here is an example for the :zephyr:code-sample:`blinky` application on M4 core.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/blinky
-   :board: arduino_giga_r1_m4
+   :board: arduino_giga_r1/stm32h747xx/m4
    :goals: build flash
 
 Debugging

boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board

@@ -1,12 +0,0 @@
-# Copyright 2023 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_ARDUINO_GIGA_R1_M7
-	bool "Arduino GIGA R1 WiFi Board (M7)"
-	depends on SOC_STM32H747XX
-	select CPU_CORTEX_M7
-
-config BOARD_ARDUINO_GIGA_R1_M4
-	bool "Arduino GIGA R1 WiFi Board (M4)"
-	depends on SOC_STM32H747XX
-	select CPU_CORTEX_M4

boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig

@@ -1,22 +0,0 @@
-# Copyright 2023 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_ARDUINO_GIGA_R1_M7 || BOARD_ARDUINO_GIGA_R1_M4
-
-config BOARD
-	default "arduino_giga_r1_m7" if BOARD_ARDUINO_GIGA_R1_M7
-	default "arduino_giga_r1_m4" if BOARD_ARDUINO_GIGA_R1_M4
-
-if BT
-
-choice AIROC_PART
-	default CYW4343W
-endchoice
-
-choice CYW4343W_MODULE
-	default CYW4343W_MURATA_1DX
-endchoice
-
-endif # BT
-
-endif # BOARD_ARDUINO_GIGA_R1_M7 || BOARD_ARDUINO_GIGA_R1_M4