From 2a572e3fb0af71ba9bc18fa865bf36605f51d793 Mon Sep 17 00:00:00 2001 From: Abderrahmane Jarmouni Date: Tue, 6 Feb 2024 17:55:21 +0100 Subject: [PATCH] boards: Convert stm32f411e_disco to HWM v2 Port the board to HWMv2. Signed-off-by: Abderrahmane Jarmouni --- .../arm/stm32f411e_disco/Kconfig.defconfig | 11 ----------- .../stm32f411e_disco/Kconfig.stm32f411e_disco} | 5 +---- .../arm => st}/stm32f411e_disco/board.cmake | 0 boards/st/stm32f411e_disco/board.yml | 11 +++++++++++ .../stm32f411e_disco/doc/img/stm32f411e_disco.jpg | Bin .../arm => st}/stm32f411e_disco/doc/index.rst | 0 .../arm => st}/stm32f411e_disco/revision.cmake | 0 .../stm32f411e_disco/stm32f411e_disco.dts | 0 .../stm32f411e_disco/stm32f411e_disco.yaml | 0 .../stm32f411e_disco/stm32f411e_disco_B.conf | 0 .../stm32f411e_disco/stm32f411e_disco_B.overlay | 0 .../stm32f411e_disco/stm32f411e_disco_D.conf | 0 .../stm32f411e_disco/stm32f411e_disco_defconfig | 3 --- .../arm => st}/stm32f411e_disco/support/openocd.cfg | 0 14 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 boards/boards_legacy/arm/stm32f411e_disco/Kconfig.defconfig rename boards/{boards_legacy/arm/stm32f411e_disco/Kconfig.board => st/stm32f411e_disco/Kconfig.stm32f411e_disco} (51%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/board.cmake (100%) create mode 100644 boards/st/stm32f411e_disco/board.yml rename boards/{boards_legacy/arm => st}/stm32f411e_disco/doc/img/stm32f411e_disco.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/doc/index.rst (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/revision.cmake (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/stm32f411e_disco.dts (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/stm32f411e_disco.yaml (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/stm32f411e_disco_B.conf (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/stm32f411e_disco_B.overlay (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/stm32f411e_disco_D.conf (100%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/stm32f411e_disco_defconfig (86%) rename boards/{boards_legacy/arm => st}/stm32f411e_disco/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/stm32f411e_disco/Kconfig.defconfig b/boards/boards_legacy/arm/stm32f411e_disco/Kconfig.defconfig deleted file mode 100644 index 28169b926e3..00000000000 --- a/boards/boards_legacy/arm/stm32f411e_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F411E-DISCO board configuration - -# Copyright (c) 2017 Fenix Engineering Solutions -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F411E_DISCO - -config BOARD - default "stm32f411e_disco" - -endif # BOARD_STM32F411E_DISCO diff --git a/boards/boards_legacy/arm/stm32f411e_disco/Kconfig.board b/boards/st/stm32f411e_disco/Kconfig.stm32f411e_disco similarity index 51% rename from boards/boards_legacy/arm/stm32f411e_disco/Kconfig.board rename to boards/st/stm32f411e_disco/Kconfig.stm32f411e_disco index 20906de1171..8ef325c580b 100644 --- a/boards/boards_legacy/arm/stm32f411e_disco/Kconfig.board +++ b/boards/st/stm32f411e_disco/Kconfig.stm32f411e_disco @@ -1,8 +1,5 @@ -# STM32F411E-DISCO board configuration - # Copyright (c) 2017 Fenix Engineering Solutions # SPDX-License-Identifier: Apache-2.0 config BOARD_STM32F411E_DISCO - bool "STM32F411E-DISCO Development Board" - depends on SOC_STM32F411XE + select SOC_STM32F411XE diff --git a/boards/boards_legacy/arm/stm32f411e_disco/board.cmake b/boards/st/stm32f411e_disco/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/board.cmake rename to boards/st/stm32f411e_disco/board.cmake diff --git a/boards/st/stm32f411e_disco/board.yml b/boards/st/stm32f411e_disco/board.yml new file mode 100644 index 00000000000..bebc3743027 --- /dev/null +++ b/boards/st/stm32f411e_disco/board.yml @@ -0,0 +1,11 @@ +board: + name: stm32f411e_disco + vendor: st + revision: + format: letter + default: "B" + revisions: + - name: "B" + - name: "D" + socs: + - name: stm32f411xe diff --git a/boards/boards_legacy/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg b/boards/st/stm32f411e_disco/doc/img/stm32f411e_disco.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg rename to boards/st/stm32f411e_disco/doc/img/stm32f411e_disco.jpg diff --git a/boards/boards_legacy/arm/stm32f411e_disco/doc/index.rst b/boards/st/stm32f411e_disco/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/doc/index.rst rename to boards/st/stm32f411e_disco/doc/index.rst diff --git a/boards/boards_legacy/arm/stm32f411e_disco/revision.cmake b/boards/st/stm32f411e_disco/revision.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/revision.cmake rename to boards/st/stm32f411e_disco/revision.cmake diff --git a/boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco.dts b/boards/st/stm32f411e_disco/stm32f411e_disco.dts similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco.dts rename to boards/st/stm32f411e_disco/stm32f411e_disco.dts diff --git a/boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco.yaml b/boards/st/stm32f411e_disco/stm32f411e_disco.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco.yaml rename to boards/st/stm32f411e_disco/stm32f411e_disco.yaml diff --git a/boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_B.conf b/boards/st/stm32f411e_disco/stm32f411e_disco_B.conf similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_B.conf rename to boards/st/stm32f411e_disco/stm32f411e_disco_B.conf diff --git a/boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_B.overlay b/boards/st/stm32f411e_disco/stm32f411e_disco_B.overlay similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_B.overlay rename to boards/st/stm32f411e_disco/stm32f411e_disco_B.overlay diff --git a/boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_D.conf b/boards/st/stm32f411e_disco/stm32f411e_disco_D.conf similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_D.conf rename to boards/st/stm32f411e_disco/stm32f411e_disco_D.conf diff --git a/boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_defconfig b/boards/st/stm32f411e_disco/stm32f411e_disco_defconfig similarity index 86% rename from boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_defconfig rename to boards/st/stm32f411e_disco/stm32f411e_disco_defconfig index 30784f3514d..67896885dac 100644 --- a/boards/boards_legacy/arm/stm32f411e_disco/stm32f411e_disco_defconfig +++ b/boards/st/stm32f411e_disco/stm32f411e_disco_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F411XE=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/stm32f411e_disco/support/openocd.cfg b/boards/st/stm32f411e_disco/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32f411e_disco/support/openocd.cfg rename to boards/st/stm32f411e_disco/support/openocd.cfg