From 959786f12dffc0f8814dc79957f320983fd80855 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Fri, 26 Jan 2024 16:13:00 +0100 Subject: [PATCH] boards: Convert nucleo_f030r8 to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- boards/arm/nucleo_f030r8/Kconfig.board | 8 -------- boards/arm/nucleo_f030r8/Kconfig.defconfig | 11 ----------- boards/arm/nucleo_f030r8/revision.cmake | 8 -------- boards/v2/st/nucleo_f030r8/Kconfig.nucleo_f030r8 | 5 +++++ .../st}/nucleo_f030r8/arduino_r3_connector.dtsi | 0 boards/{arm => v2/st}/nucleo_f030r8/board.cmake | 0 boards/v2/st/nucleo_f030r8/board.yml | 11 +++++++++++ .../st}/nucleo_f030r8/doc/img/nucleo_f030r8.jpg | Bin .../doc/img/nucleo_f030r8_connectors.jpg | Bin boards/{arm => v2/st}/nucleo_f030r8/doc/index.rst | 0 .../{arm => v2/st}/nucleo_f030r8/nucleo_f030r8.dts | 0 .../{arm => v2/st}/nucleo_f030r8/nucleo_f030r8.yaml | 0 .../st}/nucleo_f030r8/nucleo_f030r8_1.conf | 0 .../st}/nucleo_f030r8/nucleo_f030r8_1.overlay | 0 .../st}/nucleo_f030r8/nucleo_f030r8_2.conf | 0 .../st}/nucleo_f030r8/nucleo_f030r8_defconfig | 4 ---- .../st}/nucleo_f030r8/st_morpho_connector.dtsi | 0 .../st}/nucleo_f030r8/support/openocd.cfg | 0 18 files changed, 16 insertions(+), 31 deletions(-) delete mode 100644 boards/arm/nucleo_f030r8/Kconfig.board delete mode 100644 boards/arm/nucleo_f030r8/Kconfig.defconfig delete mode 100644 boards/arm/nucleo_f030r8/revision.cmake create mode 100644 boards/v2/st/nucleo_f030r8/Kconfig.nucleo_f030r8 rename boards/{arm => v2/st}/nucleo_f030r8/arduino_r3_connector.dtsi (100%) rename boards/{arm => v2/st}/nucleo_f030r8/board.cmake (100%) create mode 100644 boards/v2/st/nucleo_f030r8/board.yml rename boards/{arm => v2/st}/nucleo_f030r8/doc/img/nucleo_f030r8.jpg (100%) rename boards/{arm => v2/st}/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg (100%) rename boards/{arm => v2/st}/nucleo_f030r8/doc/index.rst (100%) rename boards/{arm => v2/st}/nucleo_f030r8/nucleo_f030r8.dts (100%) rename boards/{arm => v2/st}/nucleo_f030r8/nucleo_f030r8.yaml (100%) rename boards/{arm => v2/st}/nucleo_f030r8/nucleo_f030r8_1.conf (100%) rename boards/{arm => v2/st}/nucleo_f030r8/nucleo_f030r8_1.overlay (100%) rename boards/{arm => v2/st}/nucleo_f030r8/nucleo_f030r8_2.conf (100%) rename boards/{arm => v2/st}/nucleo_f030r8/nucleo_f030r8_defconfig (90%) rename boards/{arm => v2/st}/nucleo_f030r8/st_morpho_connector.dtsi (100%) rename boards/{arm => v2/st}/nucleo_f030r8/support/openocd.cfg (100%) diff --git a/boards/arm/nucleo_f030r8/Kconfig.board b/boards/arm/nucleo_f030r8/Kconfig.board deleted file mode 100644 index 39bd7c786d8..00000000000 --- a/boards/arm/nucleo_f030r8/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32F030R8 MCU configuration - -# Copyright (c) 2017 RnDity Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F030R8 - bool "NUCLEO-64 F030R8 Development Board" - depends on SOC_STM32F030X8 diff --git a/boards/arm/nucleo_f030r8/Kconfig.defconfig b/boards/arm/nucleo_f030r8/Kconfig.defconfig deleted file mode 100644 index 7b5331693fe..00000000000 --- a/boards/arm/nucleo_f030r8/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32 Nucleo-64 development board with STM32F030R8 MCU - -# Copyright (c) 2017 RnDity Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F030R8 - -config BOARD - default "nucleo_f030r8" - -endif # BOARD_NUCLEO_F030R8 diff --git a/boards/arm/nucleo_f030r8/revision.cmake b/boards/arm/nucleo_f030r8/revision.cmake deleted file mode 100644 index 7e5ddf37782..00000000000 --- a/boards/arm/nucleo_f030r8/revision.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2022 TOKITA Hiroshi -# -# SPDX-License-Identifier: Apache-2.0 -# - -board_check_revision(FORMAT NUMBER - DEFAULT_REVISION 2) diff --git a/boards/v2/st/nucleo_f030r8/Kconfig.nucleo_f030r8 b/boards/v2/st/nucleo_f030r8/Kconfig.nucleo_f030r8 new file mode 100644 index 00000000000..039a9e00c6c --- /dev/null +++ b/boards/v2/st/nucleo_f030r8/Kconfig.nucleo_f030r8 @@ -0,0 +1,5 @@ +# Copyright (c) 2017 RnDity Sp. z o.o. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F030R8 + select SOC_STM32F030X8 diff --git a/boards/arm/nucleo_f030r8/arduino_r3_connector.dtsi b/boards/v2/st/nucleo_f030r8/arduino_r3_connector.dtsi similarity index 100% rename from boards/arm/nucleo_f030r8/arduino_r3_connector.dtsi rename to boards/v2/st/nucleo_f030r8/arduino_r3_connector.dtsi diff --git a/boards/arm/nucleo_f030r8/board.cmake b/boards/v2/st/nucleo_f030r8/board.cmake similarity index 100% rename from boards/arm/nucleo_f030r8/board.cmake rename to boards/v2/st/nucleo_f030r8/board.cmake diff --git a/boards/v2/st/nucleo_f030r8/board.yml b/boards/v2/st/nucleo_f030r8/board.yml new file mode 100644 index 00000000000..515aae8c5b0 --- /dev/null +++ b/boards/v2/st/nucleo_f030r8/board.yml @@ -0,0 +1,11 @@ +board: + name: nucleo_f030r8 + vendor: st + revision: + format: number + default: "1" + revisions: + - name: "1" + - name: "2" + socs: + - name: stm32f030x8 diff --git a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg b/boards/v2/st/nucleo_f030r8/doc/img/nucleo_f030r8.jpg similarity index 100% rename from boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg rename to boards/v2/st/nucleo_f030r8/doc/img/nucleo_f030r8.jpg diff --git a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg b/boards/v2/st/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg similarity index 100% rename from boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg rename to boards/v2/st/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg diff --git a/boards/arm/nucleo_f030r8/doc/index.rst b/boards/v2/st/nucleo_f030r8/doc/index.rst similarity index 100% rename from boards/arm/nucleo_f030r8/doc/index.rst rename to boards/v2/st/nucleo_f030r8/doc/index.rst diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8.dts b/boards/v2/st/nucleo_f030r8/nucleo_f030r8.dts similarity index 100% rename from boards/arm/nucleo_f030r8/nucleo_f030r8.dts rename to boards/v2/st/nucleo_f030r8/nucleo_f030r8.dts diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8.yaml b/boards/v2/st/nucleo_f030r8/nucleo_f030r8.yaml similarity index 100% rename from boards/arm/nucleo_f030r8/nucleo_f030r8.yaml rename to boards/v2/st/nucleo_f030r8/nucleo_f030r8.yaml diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8_1.conf b/boards/v2/st/nucleo_f030r8/nucleo_f030r8_1.conf similarity index 100% rename from boards/arm/nucleo_f030r8/nucleo_f030r8_1.conf rename to boards/v2/st/nucleo_f030r8/nucleo_f030r8_1.conf diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8_1.overlay b/boards/v2/st/nucleo_f030r8/nucleo_f030r8_1.overlay similarity index 100% rename from boards/arm/nucleo_f030r8/nucleo_f030r8_1.overlay rename to boards/v2/st/nucleo_f030r8/nucleo_f030r8_1.overlay diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8_2.conf b/boards/v2/st/nucleo_f030r8/nucleo_f030r8_2.conf similarity index 100% rename from boards/arm/nucleo_f030r8/nucleo_f030r8_2.conf rename to boards/v2/st/nucleo_f030r8/nucleo_f030r8_2.conf diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig b/boards/v2/st/nucleo_f030r8/nucleo_f030r8_defconfig similarity index 90% rename from boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig rename to boards/v2/st/nucleo_f030r8/nucleo_f030r8_defconfig index 1ba94fff95d..1cc2b7adbea 100644 --- a/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig +++ b/boards/v2/st/nucleo_f030r8/nucleo_f030r8_defconfig @@ -1,11 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y - # Platform Configuration -CONFIG_SOC_STM32F030X8=y - # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 CONFIG_IDLE_STACK_SIZE=200 diff --git a/boards/arm/nucleo_f030r8/st_morpho_connector.dtsi b/boards/v2/st/nucleo_f030r8/st_morpho_connector.dtsi similarity index 100% rename from boards/arm/nucleo_f030r8/st_morpho_connector.dtsi rename to boards/v2/st/nucleo_f030r8/st_morpho_connector.dtsi diff --git a/boards/arm/nucleo_f030r8/support/openocd.cfg b/boards/v2/st/nucleo_f030r8/support/openocd.cfg similarity index 100% rename from boards/arm/nucleo_f030r8/support/openocd.cfg rename to boards/v2/st/nucleo_f030r8/support/openocd.cfg