From a1688ff641cb10efff529af642b5040e7d00c9a1 Mon Sep 17 00:00:00 2001 From: Abderrahmane Jarmouni Date: Tue, 6 Feb 2024 14:26:42 +0100 Subject: [PATCH] boards: Convert stm32f3_disco to HWM v2 Port the board to HWMv2. Signed-off-by: Abderrahmane Jarmouni --- .../boards_legacy/arm/stm32f3_disco/Kconfig.board | 8 -------- .../arm/stm32f3_disco/Kconfig.defconfig | 11 ----------- .../boards_legacy/arm/stm32f3_disco/revision.cmake | 4 ---- boards/st/stm32f3_disco/Kconfig.stm32f3_disco | 5 +++++ .../arm => st}/stm32f3_disco/board.cmake | 0 boards/st/stm32f3_disco/board.yml | 11 +++++++++++ .../stm32f3_disco/doc/img/stm32f3_disco.jpg | Bin .../arm => st}/stm32f3_disco/doc/index.rst | 0 .../arm => st}/stm32f3_disco/stm32f3_disco.dts | 0 .../arm => st}/stm32f3_disco/stm32f3_disco.yaml | 0 .../arm => st}/stm32f3_disco/stm32f3_disco_B.conf | 0 .../arm => st}/stm32f3_disco/stm32f3_disco_E.conf | 0 .../stm32f3_disco/stm32f3_disco_E.overlay | 0 .../arm => st}/stm32f3_disco/stm32f3_disco_E.yaml | 0 .../stm32f3_disco/stm32f3_disco_defconfig | 3 --- .../arm => st}/stm32f3_disco/support/openocd.cfg | 0 16 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 boards/boards_legacy/arm/stm32f3_disco/Kconfig.board delete mode 100644 boards/boards_legacy/arm/stm32f3_disco/Kconfig.defconfig delete mode 100644 boards/boards_legacy/arm/stm32f3_disco/revision.cmake create mode 100644 boards/st/stm32f3_disco/Kconfig.stm32f3_disco rename boards/{boards_legacy/arm => st}/stm32f3_disco/board.cmake (100%) create mode 100644 boards/st/stm32f3_disco/board.yml rename boards/{boards_legacy/arm => st}/stm32f3_disco/doc/img/stm32f3_disco.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/doc/index.rst (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/stm32f3_disco.dts (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/stm32f3_disco.yaml (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/stm32f3_disco_B.conf (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/stm32f3_disco_E.conf (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/stm32f3_disco_E.overlay (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/stm32f3_disco_E.yaml (100%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/stm32f3_disco_defconfig (85%) rename boards/{boards_legacy/arm => st}/stm32f3_disco/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/stm32f3_disco/Kconfig.board b/boards/boards_legacy/arm/stm32f3_disco/Kconfig.board deleted file mode 100644 index 280b48f7cb5..00000000000 --- a/boards/boards_legacy/arm/stm32f3_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F3DISCOVERY board configuration - -# Copyright (c) 2017 I-SENSE group of ICCS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F3_DISCO - bool "STM32F3DISCOVERY Development Board" - depends on SOC_STM32F303XC diff --git a/boards/boards_legacy/arm/stm32f3_disco/Kconfig.defconfig b/boards/boards_legacy/arm/stm32f3_disco/Kconfig.defconfig deleted file mode 100644 index f2def331570..00000000000 --- a/boards/boards_legacy/arm/stm32f3_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F3DISCOVERY board configuration - -# Copyright (c) 2017 I-SENSE group of ICCS -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F3_DISCO - -config BOARD - default "stm32f3_disco" - -endif # BOARD_STM32F3_DISCO diff --git a/boards/boards_legacy/arm/stm32f3_disco/revision.cmake b/boards/boards_legacy/arm/stm32f3_disco/revision.cmake deleted file mode 100644 index 0bacf78187d..00000000000 --- a/boards/boards_legacy/arm/stm32f3_disco/revision.cmake +++ /dev/null @@ -1,4 +0,0 @@ -board_check_revision( - FORMAT LETTER - DEFAULT_REVISION B -) \ No newline at end of file diff --git a/boards/st/stm32f3_disco/Kconfig.stm32f3_disco b/boards/st/stm32f3_disco/Kconfig.stm32f3_disco new file mode 100644 index 00000000000..0bddbf55719 --- /dev/null +++ b/boards/st/stm32f3_disco/Kconfig.stm32f3_disco @@ -0,0 +1,5 @@ +# Copyright (c) 2017 I-SENSE group of ICCS +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F3_DISCO + select SOC_STM32F303XC diff --git a/boards/boards_legacy/arm/stm32f3_disco/board.cmake b/boards/st/stm32f3_disco/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/board.cmake rename to boards/st/stm32f3_disco/board.cmake diff --git a/boards/st/stm32f3_disco/board.yml b/boards/st/stm32f3_disco/board.yml new file mode 100644 index 00000000000..ae48f138fa5 --- /dev/null +++ b/boards/st/stm32f3_disco/board.yml @@ -0,0 +1,11 @@ +board: + name: stm32f3_disco + vendor: st + revision: + format: letter + default: "B" + revisions: + - name: "B" + - name: "E" + socs: + - name: stm32f303xc diff --git a/boards/boards_legacy/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg b/boards/st/stm32f3_disco/doc/img/stm32f3_disco.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg rename to boards/st/stm32f3_disco/doc/img/stm32f3_disco.jpg diff --git a/boards/boards_legacy/arm/stm32f3_disco/doc/index.rst b/boards/st/stm32f3_disco/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/doc/index.rst rename to boards/st/stm32f3_disco/doc/index.rst diff --git a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco.dts b/boards/st/stm32f3_disco/stm32f3_disco.dts similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco.dts rename to boards/st/stm32f3_disco/stm32f3_disco.dts diff --git a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco.yaml b/boards/st/stm32f3_disco/stm32f3_disco.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco.yaml rename to boards/st/stm32f3_disco/stm32f3_disco.yaml diff --git a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_B.conf b/boards/st/stm32f3_disco/stm32f3_disco_B.conf similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_B.conf rename to boards/st/stm32f3_disco/stm32f3_disco_B.conf diff --git a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_E.conf b/boards/st/stm32f3_disco/stm32f3_disco_E.conf similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_E.conf rename to boards/st/stm32f3_disco/stm32f3_disco_E.conf diff --git a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_E.overlay b/boards/st/stm32f3_disco/stm32f3_disco_E.overlay similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_E.overlay rename to boards/st/stm32f3_disco/stm32f3_disco_E.overlay diff --git a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_E.yaml b/boards/st/stm32f3_disco/stm32f3_disco_E.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_E.yaml rename to boards/st/stm32f3_disco/stm32f3_disco_E.yaml diff --git a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_defconfig b/boards/st/stm32f3_disco/stm32f3_disco_defconfig similarity index 85% rename from boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_defconfig rename to boards/st/stm32f3_disco/stm32f3_disco_defconfig index fae0909e840..ed90d066c5a 100644 --- a/boards/boards_legacy/arm/stm32f3_disco/stm32f3_disco_defconfig +++ b/boards/st/stm32f3_disco/stm32f3_disco_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F3X=y -CONFIG_SOC_STM32F303XC=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/stm32f3_disco/support/openocd.cfg b/boards/st/stm32f3_disco/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32f3_disco/support/openocd.cfg rename to boards/st/stm32f3_disco/support/openocd.cfg