From 4c86af7eaeff56bce05d6c4fad23c408f61f1d2d Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:53:06 +0100 Subject: [PATCH] boards: Convert arduino_opta_m4 to HWM v2 Port the board to HWMv2. Additionally, change the board name to arduino_opta as the compilation target is now fully explicit on the core in use. Besides, it will ease a potential addition of the m7 core. Signed-off-by: Erwan Gouriou --- boards/arduino/arduino_opta/Kconfig.arduino_opta | 5 +++++ .../arduino_opta/arduino_opta_stm32h747xx_m4.dts} | 0 .../arduino_opta/arduino_opta_stm32h747xx_m4.yaml} | 2 +- .../arduino_opta_stm32h747xx_m4_defconfig} | 5 ----- .../arduino_opta}/board.cmake | 0 boards/arduino/arduino_opta/board.yml | 5 +++++ .../arduino_opta}/doc/img/arduino_opta.jpeg | Bin .../arduino_opta}/doc/index.rst | 8 ++++---- .../boards_legacy/arm/arduino_opta_m4/Kconfig.board | 7 ------- .../arm/arduino_opta_m4/Kconfig.defconfig | 9 --------- 10 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 boards/arduino/arduino_opta/Kconfig.arduino_opta rename boards/{boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.dts => arduino/arduino_opta/arduino_opta_stm32h747xx_m4.dts} (100%) rename boards/{boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml => arduino/arduino_opta/arduino_opta_stm32h747xx_m4.yaml} (85%) rename boards/{boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig => arduino/arduino_opta/arduino_opta_stm32h747xx_m4_defconfig} (80%) rename boards/{boards_legacy/arm/arduino_opta_m4 => arduino/arduino_opta}/board.cmake (100%) create mode 100644 boards/arduino/arduino_opta/board.yml rename boards/{boards_legacy/arm/arduino_opta_m4 => arduino/arduino_opta}/doc/img/arduino_opta.jpeg (100%) rename boards/{boards_legacy/arm/arduino_opta_m4 => arduino/arduino_opta}/doc/index.rst (96%) delete mode 100644 boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board delete mode 100644 boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig diff --git a/boards/arduino/arduino_opta/Kconfig.arduino_opta b/boards/arduino/arduino_opta/Kconfig.arduino_opta new file mode 100644 index 00000000000..d591283a6ff --- /dev/null +++ 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/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.dts b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.dts rename to boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.dts diff --git a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.yaml similarity index 85% rename from boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml rename to boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.yaml index 4030cb402f6..e7495a72ea1 100644 --- a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml +++ b/boards/arduino/arduino_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/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4_defconfig similarity index 80% rename from boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig rename to boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4_defconfig index bcf01ccabfb..f9f3e39d9c7 100644 --- a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig +++ b/boards/arduino/arduino_opta/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/boards/boards_legacy/arm/arduino_opta_m4/board.cmake b/boards/arduino/arduino_opta/board.cmake similarity index 100% rename from boards/boards_legacy/arm/arduino_opta_m4/board.cmake rename to boards/arduino/arduino_opta/board.cmake diff --git a/boards/arduino/arduino_opta/board.yml b/boards/arduino/arduino_opta/board.yml new file mode 100644 index 00000000000..c572627b348 --- /dev/null +++ b/boards/arduino/arduino_opta/board.yml @@ -0,0 +1,5 @@ +board: + name: arduino_opta + vendor: arduino + socs: + - name: stm32h747xx diff --git a/boards/boards_legacy/arm/arduino_opta_m4/doc/img/arduino_opta.jpeg b/boards/arduino/arduino_opta/doc/img/arduino_opta.jpeg similarity index 100% rename from boards/boards_legacy/arm/arduino_opta_m4/doc/img/arduino_opta.jpeg rename to boards/arduino/arduino_opta/doc/img/arduino_opta.jpeg diff --git a/boards/boards_legacy/arm/arduino_opta_m4/doc/index.rst b/boards/arduino/arduino_opta/doc/index.rst similarity index 96% rename from boards/boards_legacy/arm/arduino_opta_m4/doc/index.rst rename to boards/arduino/arduino_opta/doc/index.rst index 90f9497db33..db9a23e2d0f 100644 --- a/boards/boards_legacy/arm/arduino_opta_m4/doc/index.rst +++ b/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/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board b/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board deleted file mode 100644 index cce1cd6337a..00000000000 --- a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2023 Felipe Neves -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_OPTA_M4 - bool "Arduino OPTA Programmable Logic Controller M4 Core" - depends on SOC_STM32H747XX - select CPU_CORTEX_M4 diff --git a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig deleted file mode 100644 index be17c009555..00000000000 --- a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2023 Felipe Neves -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ARDUINO_OPTA_M4 - -config BOARD - default "arduino_opta_m4" - -endif # BOARD_ARDUINO_OPTA_M4