From 2d9c62e118f1f109ad674902164e722b6cd0340c Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 29 Jan 2024 16:39:54 +0100 Subject: [PATCH] boards: Convert nucleo_f103rb to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- boards/arm/nucleo_f103rb/Kconfig.board | 8 -------- boards/arm/nucleo_f103rb/Kconfig.defconfig | 11 ----------- boards/v2/st/nucleo_f103rb/Kconfig.nucleo_f103rb | 5 +++++ .../st}/nucleo_f103rb/arduino_r3_connector.dtsi | 0 boards/{arm => v2/st}/nucleo_f103rb/board.cmake | 0 boards/v2/st/nucleo_f103rb/board.yml | 5 +++++ .../st}/nucleo_f103rb/doc/img/nucleo_f103rb.jpg | Bin .../doc/img/nucleo_f103rb_connectors.jpg | Bin boards/{arm => v2/st}/nucleo_f103rb/doc/index.rst | 0 .../{arm => v2/st}/nucleo_f103rb/nucleo_f103rb.dts | 0 .../{arm => v2/st}/nucleo_f103rb/nucleo_f103rb.yaml | 0 .../st}/nucleo_f103rb/nucleo_f103rb_defconfig | 3 --- .../st}/nucleo_f103rb/st_morpho_connector.dtsi | 0 .../st}/nucleo_f103rb/support/openocd.cfg | 0 14 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 boards/arm/nucleo_f103rb/Kconfig.board delete mode 100644 boards/arm/nucleo_f103rb/Kconfig.defconfig create mode 100644 boards/v2/st/nucleo_f103rb/Kconfig.nucleo_f103rb rename boards/{arm => v2/st}/nucleo_f103rb/arduino_r3_connector.dtsi (100%) rename boards/{arm => v2/st}/nucleo_f103rb/board.cmake (100%) create mode 100644 boards/v2/st/nucleo_f103rb/board.yml rename boards/{arm => v2/st}/nucleo_f103rb/doc/img/nucleo_f103rb.jpg (100%) rename boards/{arm => v2/st}/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg (100%) rename boards/{arm => v2/st}/nucleo_f103rb/doc/index.rst (100%) rename boards/{arm => v2/st}/nucleo_f103rb/nucleo_f103rb.dts (100%) rename boards/{arm => v2/st}/nucleo_f103rb/nucleo_f103rb.yaml (100%) rename boards/{arm => v2/st}/nucleo_f103rb/nucleo_f103rb_defconfig (81%) rename boards/{arm => v2/st}/nucleo_f103rb/st_morpho_connector.dtsi (100%) rename boards/{arm => v2/st}/nucleo_f103rb/support/openocd.cfg (100%) diff --git a/boards/arm/nucleo_f103rb/Kconfig.board b/boards/arm/nucleo_f103rb/Kconfig.board deleted file mode 100644 index e175a30e368..00000000000 --- a/boards/arm/nucleo_f103rb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-64 F103RB board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F103RB - bool "NUCLEO-64 F103RB Development Board" - depends on SOC_STM32F103XB diff --git a/boards/arm/nucleo_f103rb/Kconfig.defconfig b/boards/arm/nucleo_f103rb/Kconfig.defconfig deleted file mode 100644 index 3d4c0581a96..00000000000 --- a/boards/arm/nucleo_f103rb/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# NUCLEO-64 F103RB board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F103RB - -config BOARD - default "nucleo_f103rb" - -endif # BOARD_NUCLEO_F103RB diff --git a/boards/v2/st/nucleo_f103rb/Kconfig.nucleo_f103rb b/boards/v2/st/nucleo_f103rb/Kconfig.nucleo_f103rb new file mode 100644 index 00000000000..08cdc321800 --- /dev/null +++ b/boards/v2/st/nucleo_f103rb/Kconfig.nucleo_f103rb @@ -0,0 +1,5 @@ +# Copyright (c) 2016 Open-RnD Sp. z o.o. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F103RB + select SOC_STM32F103XB diff --git a/boards/arm/nucleo_f103rb/arduino_r3_connector.dtsi b/boards/v2/st/nucleo_f103rb/arduino_r3_connector.dtsi similarity index 100% rename from boards/arm/nucleo_f103rb/arduino_r3_connector.dtsi rename to boards/v2/st/nucleo_f103rb/arduino_r3_connector.dtsi diff --git a/boards/arm/nucleo_f103rb/board.cmake b/boards/v2/st/nucleo_f103rb/board.cmake similarity index 100% rename from boards/arm/nucleo_f103rb/board.cmake rename to boards/v2/st/nucleo_f103rb/board.cmake diff --git a/boards/v2/st/nucleo_f103rb/board.yml b/boards/v2/st/nucleo_f103rb/board.yml new file mode 100644 index 00000000000..57425f7832d --- /dev/null +++ b/boards/v2/st/nucleo_f103rb/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_f103rb + vendor: st + socs: + - name: stm32f103xb diff --git a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg b/boards/v2/st/nucleo_f103rb/doc/img/nucleo_f103rb.jpg similarity index 100% rename from boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg rename to boards/v2/st/nucleo_f103rb/doc/img/nucleo_f103rb.jpg diff --git a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg b/boards/v2/st/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg similarity index 100% rename from boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg rename to boards/v2/st/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg diff --git a/boards/arm/nucleo_f103rb/doc/index.rst b/boards/v2/st/nucleo_f103rb/doc/index.rst similarity index 100% rename from boards/arm/nucleo_f103rb/doc/index.rst rename to boards/v2/st/nucleo_f103rb/doc/index.rst diff --git a/boards/arm/nucleo_f103rb/nucleo_f103rb.dts b/boards/v2/st/nucleo_f103rb/nucleo_f103rb.dts similarity index 100% rename from boards/arm/nucleo_f103rb/nucleo_f103rb.dts rename to boards/v2/st/nucleo_f103rb/nucleo_f103rb.dts diff --git a/boards/arm/nucleo_f103rb/nucleo_f103rb.yaml b/boards/v2/st/nucleo_f103rb/nucleo_f103rb.yaml similarity index 100% rename from boards/arm/nucleo_f103rb/nucleo_f103rb.yaml rename to boards/v2/st/nucleo_f103rb/nucleo_f103rb.yaml diff --git a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig b/boards/v2/st/nucleo_f103rb/nucleo_f103rb_defconfig similarity index 81% rename from boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig rename to boards/v2/st/nucleo_f103rb/nucleo_f103rb_defconfig index b3d7a802a88..d4828716f02 100644 --- a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig +++ b/boards/v2/st/nucleo_f103rb/nucleo_f103rb_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103XB=y - # enable uart driver CONFIG_SERIAL=y # enable console diff --git a/boards/arm/nucleo_f103rb/st_morpho_connector.dtsi b/boards/v2/st/nucleo_f103rb/st_morpho_connector.dtsi similarity index 100% rename from boards/arm/nucleo_f103rb/st_morpho_connector.dtsi rename to boards/v2/st/nucleo_f103rb/st_morpho_connector.dtsi diff --git a/boards/arm/nucleo_f103rb/support/openocd.cfg b/boards/v2/st/nucleo_f103rb/support/openocd.cfg similarity index 100% rename from boards/arm/nucleo_f103rb/support/openocd.cfg rename to boards/v2/st/nucleo_f103rb/support/openocd.cfg