diff --git a/boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1 b/boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1 new file mode 100644 index 00000000000..6eb5d937b84 --- /dev/null +++ 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 new file mode 100644 index 00000000000..0d20cf3c341 --- /dev/null +++ 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/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1.dtsi b/boards/arduino/arduino_giga_r1/arduino_giga_r1.dtsi similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1.dtsi rename to boards/arduino/arduino_giga_r1/arduino_giga_r1.dtsi diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.dts b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.dts rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.dts diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.yaml similarity index 84% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.yaml index 58b71369e12..3917682bd21 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml +++ b/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 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4_defconfig similarity index 69% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4_defconfig index 1ab438cb15a..c7a9e88969b 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.dts b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.dts rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.dts diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.yaml b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.yaml similarity index 84% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.yaml rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.yaml index 2e844a14804..cdcaeba7c77 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.yaml +++ b/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 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7_defconfig b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7_defconfig similarity index 75% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7_defconfig rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7_defconfig index 8f4491908e6..0bd7546e26a 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_r3_connector.dtsi b/boards/arduino/arduino_giga_r1/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_r3_connector.dtsi rename to boards/arduino/arduino_giga_r1/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/arduino_giga_r1/board.cmake b/boards/arduino/arduino_giga_r1/board.cmake similarity index 89% rename from boards/boards_legacy/arm/arduino_giga_r1/board.cmake rename to boards/arduino/arduino_giga_r1/board.cmake index 849f9f933f1..f02ceaf2c3d 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/board.cmake +++ b/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 new file mode 100644 index 00000000000..3079c2f0d5c --- /dev/null +++ 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/boards/boards_legacy/arm/arduino_giga_r1/doc/img/arduino_giga_r1.jpg b/boards/arduino/arduino_giga_r1/doc/img/arduino_giga_r1.jpg similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/doc/img/arduino_giga_r1.jpg rename to boards/arduino/arduino_giga_r1/doc/img/arduino_giga_r1.jpg diff --git a/boards/boards_legacy/arm/arduino_giga_r1/doc/index.rst b/boards/arduino/arduino_giga_r1/doc/index.rst similarity index 96% rename from boards/boards_legacy/arm/arduino_giga_r1/doc/index.rst rename to boards/arduino/arduino_giga_r1/doc/index.rst index 2e2b03917cc..0e95653edfa 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/doc/index.rst +++ b/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 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg b/boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg rename to boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg diff --git a/boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg b/boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg rename to boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg diff --git a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board b/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board deleted file mode 100644 index c810f6f31fc..00000000000 --- a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig deleted file mode 100644 index e72fb499055..00000000000 --- a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig +++ /dev/null @@ -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