zephyrproject-rtos · erwango · Feb 16, 2024 · Feb 5, 2024 · Feb 5, 2024 · Feb 5, 2024
diff --git a/boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1 b/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
diff --git a/boards/arduino/arduino_giga_r1/Kconfig.defconfig b/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
diff --git a/.../arm/arduino_giga_r1/arduino_giga_r1.dtsi → ...uino/arduino_giga_r1/arduino_giga_r1.dtsi b/.../arm/arduino_giga_r1/arduino_giga_r1.dtsi → ...uino/arduino_giga_r1/arduino_giga_r1.dtsi
diff --git a/...rm/arduino_giga_r1/arduino_giga_r1_m4.dts → ...iga_r1/arduino_giga_r1_stm32h747xx_m4.dts b/...rm/arduino_giga_r1/arduino_giga_r1_m4.dts → ...iga_r1/arduino_giga_r1_stm32h747xx_m4.dts
diff --git a/...m/arduino_giga_r1/arduino_giga_r1_m4.yaml → ...ga_r1/arduino_giga_r1_stm32h747xx_m4.yaml b/...m/arduino_giga_r1/arduino_giga_r1_m4.yaml → ...ga_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

diff --git a/...uino_giga_r1/arduino_giga_r1_m4_defconfig → .../arduino_giga_r1_stm32h747xx_m4_defconfig b/...uino_giga_r1/arduino_giga_r1_m4_defconfig → .../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
 

diff --git a/...rm/arduino_giga_r1/arduino_giga_r1_m7.dts → ...iga_r1/arduino_giga_r1_stm32h747xx_m7.dts b/...rm/arduino_giga_r1/arduino_giga_r1_m7.dts → ...iga_r1/arduino_giga_r1_stm32h747xx_m7.dts
diff --git a/...m/arduino_giga_r1/arduino_giga_r1_m7.yaml → ...ga_r1/arduino_giga_r1_stm32h747xx_m7.yaml b/...m/arduino_giga_r1/arduino_giga_r1_m7.yaml → ...ga_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

diff --git a/...uino_giga_r1/arduino_giga_r1_m7_defconfig → .../arduino_giga_r1_stm32h747xx_m7_defconfig b/...uino_giga_r1/arduino_giga_r1_m7_defconfig → .../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
 

diff --git a/...arduino_giga_r1/arduino_r3_connector.dtsi → ...arduino_giga_r1/arduino_r3_connector.dtsi b/...arduino_giga_r1/arduino_r3_connector.dtsi → ...arduino_giga_r1/arduino_r3_connector.dtsi
diff --git a/...ds_legacy/arm/arduino_giga_r1/board.cmake → boards/arduino/arduino_giga_r1/board.cmake b/...ds_legacy/arm/arduino_giga_r1/board.cmake → 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)

diff --git a/boards/arduino/arduino_giga_r1/board.yml b/boards/arduino/arduino_giga_r1/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: arduino_giga_r1
+  vendor: arduino
+  socs:
+    - name: stm32h747xx
diff --git a/...duino_giga_r1/doc/img/arduino_giga_r1.jpg → ...duino_giga_r1/doc/img/arduino_giga_r1.jpg b/...duino_giga_r1/doc/img/arduino_giga_r1.jpg → ...duino_giga_r1/doc/img/arduino_giga_r1.jpg
diff --git a/..._legacy/arm/arduino_giga_r1/doc/index.rst → boards/arduino/arduino_giga_r1/doc/index.rst b/..._legacy/arm/arduino_giga_r1/doc/index.rst → 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,15 +147,15 @@ 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.
 
 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

diff --git a/...r1/support/openocd_arduino_giga_r1_m4.cfg → ...r1/support/openocd_arduino_giga_r1_m4.cfg b/...r1/support/openocd_arduino_giga_r1_m4.cfg → ...r1/support/openocd_arduino_giga_r1_m4.cfg
diff --git a/...r1/support/openocd_arduino_giga_r1_m7.cfg → ...r1/support/openocd_arduino_giga_r1_m7.cfg b/...r1/support/openocd_arduino_giga_r1_m7.cfg → ...r1/support/openocd_arduino_giga_r1_m7.cfg
diff --git a/boards/arduino/arduino_opta/Kconfig.arduino_opta b/boards/arduino/arduino_opta/Kconfig.arduino_opta
@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Felipe Neves
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ARDUINO_OPTA
+	select SOC_STM32H747XX_M4
diff --git a/...y/arm/arduino_opta_m4/arduino_opta_m4.dts → ...uino_opta/arduino_opta_stm32h747xx_m4.dts b/...y/arm/arduino_opta_m4/arduino_opta_m4.dts → ...uino_opta/arduino_opta_stm32h747xx_m4.dts
diff --git a/.../arm/arduino_opta_m4/arduino_opta_m4.yaml → ...ino_opta/arduino_opta_stm32h747xx_m4.yaml b/.../arm/arduino_opta_m4/arduino_opta_m4.yaml → ...ino_opta/arduino_opta_stm32h747xx_m4.yaml
@@ -1,4 +1,4 @@
-identifier: arduino_opta_m4
+identifier: arduino_opta/stm32h747xx/m4
 name: ARDUINO OPTA (M4)
 type: mcu
 arch: arm

diff --git a/...arduino_opta_m4/arduino_opta_m4_defconfig → ...pta/arduino_opta_stm32h747xx_m4_defconfig b/...arduino_opta_m4/arduino_opta_m4_defconfig → ...pta/arduino_opta_stm32h747xx_m4_defconfig
@@ -1,11 +1,6 @@
 # Copyright (c) 2023 Felipe Neves
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32H7X=y
-CONFIG_SOC_STM32H747XX=y
-
-CONFIG_BOARD_ARDUINO_OPTA_M4=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/...ds_legacy/arm/arduino_opta_m4/board.cmake → boards/arduino/arduino_opta/board.cmake b/...ds_legacy/arm/arduino_opta_m4/board.cmake → boards/arduino/arduino_opta/board.cmake
diff --git a/boards/arduino/arduino_opta/board.yml b/boards/arduino/arduino_opta/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: arduino_opta
+  vendor: arduino
+  socs:
+    - name: stm32h747xx
diff --git a/...arduino_opta_m4/doc/img/arduino_opta.jpeg → ...no/arduino_opta/doc/img/arduino_opta.jpeg b/...arduino_opta_m4/doc/img/arduino_opta.jpeg → ...no/arduino_opta/doc/img/arduino_opta.jpeg
diff --git a/..._legacy/arm/arduino_opta_m4/doc/index.rst → boards/arduino/arduino_opta/doc/index.rst b/..._legacy/arm/arduino_opta_m4/doc/index.rst → boards/arduino/arduino_opta/doc/index.rst
@@ -1,7 +1,7 @@
 .. _arduino_opta_m4_board:
 
 Arduino OPTA M4-Core
-#######################
+####################
 
 Overview
 ********
@@ -63,7 +63,7 @@ The current Zephyr arduino_opta_m4 board configuration supports the following ha
 Other hardware features are not yet supported on Zephyr porting.
 
 The default configuration per core can be found in the defconfig files:
-``boards/arm/arduino_opta_m4/arduino_opta_m4_defconfig``
+:zephyr_file:`boards/arduino/arduino_opta/arduino_opta_m4_defconfig`
 
 Pin Mapping
 ===========
@@ -107,7 +107,7 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
-Applications for the ``arduino_opta_m4`` use the regular Zephyr build commands.
+Applications for the ``arduino_opta`` use the regular Zephyr build commands.
 See :ref:`build_an_application` for more information about application builds.
 
 Flashing
@@ -135,7 +135,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_opta_m4
+   :board: arduino_opta/stm32h747xx/m4
    :goals: build flash
 
 Starting the application on the ARDUINO OPTA M4

diff --git a/...cy/arm/arduino_portenta_h7/CMakeLists.txt → ...rduino/arduino_portenta_h7/CMakeLists.txt b/...cy/arm/arduino_portenta_h7/CMakeLists.txt → ...rduino/arduino_portenta_h7/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Benjamin Björnsson <benjamin.bjornsson@gmail.com>.
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_ARDUINO_PORTENTA_H7_M7)
+if(CONFIG_BOARD_ARDUINO_PORTENTA_H7_STM32H747XX_M7)
 
 zephyr_library()
 zephyr_library_sources(board.c)

diff --git a/boards/arduino/arduino_portenta_h7/Kconfig.arduino_portenta_h7 b/boards/arduino/arduino_portenta_h7/Kconfig.arduino_portenta_h7
@@ -0,0 +1,8 @@
+# Arduino Portenta H7 board configuration
+
+# Copyright (c) 2022 Benjamin Björnsson <benjamin.bjornsson@gmail.com>.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ARDUINO_PORTENTA_H7
+	select SOC_STM32H747XX_M7 if BOARD_ARDUINO_PORTENTA_H7_STM32H747XX_M7
+	select SOC_STM32H747XX_M4 if BOARD_ARDUINO_PORTENTA_H7_STM32H747XX_M4
diff --git a/...rtenta_h7/arduino_portenta_h7-common.dtsi → ...rtenta_h7/arduino_portenta_h7-common.dtsi b/...rtenta_h7/arduino_portenta_h7-common.dtsi → ...rtenta_h7/arduino_portenta_h7-common.dtsi
diff --git a/...no_portenta_h7/arduino_portenta_h7_m4.dts → ...h7/arduino_portenta_h7_stm32h747xx_m4.dts b/...no_portenta_h7/arduino_portenta_h7_m4.dts → ...h7/arduino_portenta_h7_stm32h747xx_m4.dts
diff --git a/...o_portenta_h7/arduino_portenta_h7_m4.yaml → ...7/arduino_portenta_h7_stm32h747xx_m4.yaml b/...o_portenta_h7/arduino_portenta_h7_m4.yaml → ...7/arduino_portenta_h7_stm32h747xx_m4.yaml
@@ -1,4 +1,4 @@
-identifier: arduino_portenta_h7_m4
+identifier: arduino_portenta_h7/stm32h747xx/m4
 name: Arduino Portenta H7 (M4)
 type: mcu
 arch: arm

diff --git a/...tenta_h7/arduino_portenta_h7_m4_defconfig → ...uino_portenta_h7_stm32h747xx_m4_defconfig b/...tenta_h7/arduino_portenta_h7_m4_defconfig → ...uino_portenta_h7_stm32h747xx_m4_defconfig
@@ -1,12 +1,6 @@
 # Copyright (c) 2022 Benjamin Björnsson <benjamin.bjornsson@gmail.com>.
 # 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_PORTENTA_H7_M4=y
-
 # Enable GPIO
 CONFIG_GPIO=y
 

diff --git a/...no_portenta_h7/arduino_portenta_h7_m7.dts → ...h7/arduino_portenta_h7_stm32h747xx_m7.dts b/...no_portenta_h7/arduino_portenta_h7_m7.dts → ...h7/arduino_portenta_h7_stm32h747xx_m7.dts
diff --git a/...o_portenta_h7/arduino_portenta_h7_m7.yaml → ...7/arduino_portenta_h7_stm32h747xx_m7.yaml b/...o_portenta_h7/arduino_portenta_h7_m7.yaml → ...7/arduino_portenta_h7_stm32h747xx_m7.yaml
@@ -1,4 +1,4 @@
-identifier: arduino_portenta_h7_m7
+identifier: arduino_portenta_h7/stm32h747xx/m7
 name: Arduino Portenta H7 (M7)
 type: mcu
 arch: arm

diff --git a/...tenta_h7/arduino_portenta_h7_m7_defconfig → ...uino_portenta_h7_stm32h747xx_m7_defconfig b/...tenta_h7/arduino_portenta_h7_m7_defconfig → ...uino_portenta_h7_stm32h747xx_m7_defconfig
@@ -1,12 +1,6 @@
 # Copyright (c) 2022 Benjamin Björnsson <benjamin.bjornsson@gmail.com>.
 # 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_PORTENTA_H7_M7=y
-
 # Enable the internal SMPS regulator
 CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
 

diff --git a/...ds_legacy/arm/arduino_portenta_h7/board.c → boards/arduino/arduino_portenta_h7/board.c b/...ds_legacy/arm/arduino_portenta_h7/board.c → boards/arduino/arduino_portenta_h7/board.c
diff --git a/...egacy/arm/arduino_portenta_h7/board.cmake → ...s/arduino/arduino_portenta_h7/board.cmake b/...egacy/arm/arduino_portenta_h7/board.cmake → ...s/arduino/arduino_portenta_h7/board.cmake
diff --git a/boards/arduino/arduino_portenta_h7/board.yml b/boards/arduino/arduino_portenta_h7/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: arduino_portenta_h7
+  vendor: arduino
+  socs:
+    - name: stm32h747xx
diff --git a/...tenta_h7/doc/img/arduino_portenta_h7.jpeg → ...tenta_h7/doc/img/arduino_portenta_h7.jpeg b/...tenta_h7/doc/img/arduino_portenta_h7.jpeg → ...tenta_h7/doc/img/arduino_portenta_h7.jpeg
diff --git a/...acy/arm/arduino_portenta_h7/doc/index.rst → ...arduino/arduino_portenta_h7/doc/index.rst b/...acy/arm/arduino_portenta_h7/doc/index.rst → ...arduino/arduino_portenta_h7/doc/index.rst
@@ -1,7 +1,7 @@
 .. _arduino_portenta_h7_board:
 
 Arduino Portenta H7
-#######################
+###################
 
 Overview
 ********
@@ -103,7 +103,7 @@ Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: arduino_portenta_h7_m7
+   :board: arduino_portenta_h7/stm32h747xx/m7
    :goals: build flash
 
 Run a serial host program to connect with your board:
@@ -116,7 +116,7 @@ You should see the following message on the console:
 
 .. code-block:: console
 
-   Hello World! arduino_portenta_m7
+   Hello World! arduino_portenta_h7
 
 Similarly, you can build and flash samples on the M4 target. For this, please
 take care of the resource sharing (UART port used for console for instance).
@@ -125,7 +125,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_portenta_h7_m4
+   :board: arduino_portenta_h7/stm32h747xx/m4
    :goals: build flash
 
 .. _ARDUINO_PORTENTA_H7 website:

diff --git a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board b/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board
diff --git a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig
diff --git a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board b/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board
diff --git a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig
diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.board b/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.board
diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.defconfig
diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.defconfig b/boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.defconfig
diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.board b/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.board