From 39c26f09ed4fec6d300170e7ebd29953e5f717d0 Mon Sep 17 00:00:00 2001 From: Guillaume Gautier Date: Fri, 9 Feb 2024 09:14:49 +0100 Subject: [PATCH] boards: Convert stm32l496g_disco to HWM v2 Port the board to HWMv2. Signed-off-by: Guillaume Gautier --- .../arm/stm32l496g_disco/Kconfig.board | 10 ---------- .../arm => st}/stm32l496g_disco/CMakeLists.txt | 0 .../arm => st}/stm32l496g_disco/Kconfig.defconfig | 3 --- boards/st/stm32l496g_disco/Kconfig.stm32l496g_disco | 5 +++++ .../stm32l496g_disco/arduino_r3_connector.dtsi | 0 .../arm => st}/stm32l496g_disco/board.cmake | 0 boards/st/stm32l496g_disco/board.yml | 5 +++++ .../arm => st}/stm32l496g_disco/board_adc_vref.c | 0 .../stm32l496g_disco/doc/img/stm32l496g_disco.jpg | Bin .../arm => st}/stm32l496g_disco/doc/index.rst | 2 +- .../stm32l496g_disco/stm32l496g_disco.dts | 0 .../stm32l496g_disco/stm32l496g_disco.yaml | 0 .../stm32l496g_disco/stm32l496g_disco_defconfig | 3 --- .../arm => st}/stm32l496g_disco/support/openocd.cfg | 0 14 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 boards/boards_legacy/arm/stm32l496g_disco/Kconfig.board rename boards/{boards_legacy/arm => st}/stm32l496g_disco/CMakeLists.txt (100%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/Kconfig.defconfig (88%) create mode 100644 boards/st/stm32l496g_disco/Kconfig.stm32l496g_disco rename boards/{boards_legacy/arm => st}/stm32l496g_disco/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/board.cmake (100%) create mode 100644 boards/st/stm32l496g_disco/board.yml rename boards/{boards_legacy/arm => st}/stm32l496g_disco/board_adc_vref.c (100%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/doc/img/stm32l496g_disco.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/doc/index.rst (99%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/stm32l496g_disco.dts (100%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/stm32l496g_disco.yaml (100%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/stm32l496g_disco_defconfig (85%) rename boards/{boards_legacy/arm => st}/stm32l496g_disco/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/stm32l496g_disco/Kconfig.board b/boards/boards_legacy/arm/stm32l496g_disco/Kconfig.board deleted file mode 100644 index 4d2e23204a8..00000000000 --- a/boards/boards_legacy/arm/stm32l496g_disco/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# STM32L496G Discovery board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# Copyright (c) 2016 BayLibre, SAS -# Copyright (c) 2019 Centaur Analytics, Inc -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32L496G_DISCO - bool "STM32L496G Discovery Development Board" - depends on SOC_STM32L496XX diff --git a/boards/boards_legacy/arm/stm32l496g_disco/CMakeLists.txt b/boards/st/stm32l496g_disco/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/CMakeLists.txt rename to boards/st/stm32l496g_disco/CMakeLists.txt diff --git a/boards/boards_legacy/arm/stm32l496g_disco/Kconfig.defconfig b/boards/st/stm32l496g_disco/Kconfig.defconfig similarity index 88% rename from boards/boards_legacy/arm/stm32l496g_disco/Kconfig.defconfig rename to boards/st/stm32l496g_disco/Kconfig.defconfig index 114aacf680d..604ea42983c 100644 --- a/boards/boards_legacy/arm/stm32l496g_disco/Kconfig.defconfig +++ b/boards/st/stm32l496g_disco/Kconfig.defconfig @@ -6,9 +6,6 @@ if BOARD_STM32L496G_DISCO -config BOARD - default "stm32l496g_disco" - config SPI_STM32_INTERRUPT default y depends on SPI diff --git a/boards/st/stm32l496g_disco/Kconfig.stm32l496g_disco b/boards/st/stm32l496g_disco/Kconfig.stm32l496g_disco new file mode 100644 index 00000000000..43f50ffced9 --- /dev/null +++ b/boards/st/stm32l496g_disco/Kconfig.stm32l496g_disco @@ -0,0 +1,5 @@ +# Copyright (c) 2019 Centaur Analytics, Inc +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32L496G_DISCO + select SOC_STM32L496XX diff --git a/boards/boards_legacy/arm/stm32l496g_disco/arduino_r3_connector.dtsi b/boards/st/stm32l496g_disco/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/arduino_r3_connector.dtsi rename to boards/st/stm32l496g_disco/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/stm32l496g_disco/board.cmake b/boards/st/stm32l496g_disco/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/board.cmake rename to boards/st/stm32l496g_disco/board.cmake diff --git a/boards/st/stm32l496g_disco/board.yml b/boards/st/stm32l496g_disco/board.yml new file mode 100644 index 00000000000..9d6b18a598d --- /dev/null +++ b/boards/st/stm32l496g_disco/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32l496g_disco + vendor: st + socs: + - name: stm32l496xx diff --git a/boards/boards_legacy/arm/stm32l496g_disco/board_adc_vref.c b/boards/st/stm32l496g_disco/board_adc_vref.c similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/board_adc_vref.c rename to boards/st/stm32l496g_disco/board_adc_vref.c diff --git a/boards/boards_legacy/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg b/boards/st/stm32l496g_disco/doc/img/stm32l496g_disco.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg rename to boards/st/stm32l496g_disco/doc/img/stm32l496g_disco.jpg diff --git a/boards/boards_legacy/arm/stm32l496g_disco/doc/index.rst b/boards/st/stm32l496g_disco/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/stm32l496g_disco/doc/index.rst rename to boards/st/stm32l496g_disco/doc/index.rst index e8bc81f092b..06b0493e722 100644 --- a/boards/boards_legacy/arm/stm32l496g_disco/doc/index.rst +++ b/boards/st/stm32l496g_disco/doc/index.rst @@ -155,7 +155,7 @@ Other hardware features are not yet supported on this Zephyr port. The default configuration can be found in the defconfig file: - ``boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig`` + ``boards/st/stm32l496g_disco/stm32l496g_disco_defconfig`` Connections and IOs diff --git a/boards/boards_legacy/arm/stm32l496g_disco/stm32l496g_disco.dts b/boards/st/stm32l496g_disco/stm32l496g_disco.dts similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/stm32l496g_disco.dts rename to boards/st/stm32l496g_disco/stm32l496g_disco.dts diff --git a/boards/boards_legacy/arm/stm32l496g_disco/stm32l496g_disco.yaml b/boards/st/stm32l496g_disco/stm32l496g_disco.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/stm32l496g_disco.yaml rename to boards/st/stm32l496g_disco/stm32l496g_disco.yaml diff --git a/boards/boards_legacy/arm/stm32l496g_disco/stm32l496g_disco_defconfig b/boards/st/stm32l496g_disco/stm32l496g_disco_defconfig similarity index 85% rename from boards/boards_legacy/arm/stm32l496g_disco/stm32l496g_disco_defconfig rename to boards/st/stm32l496g_disco/stm32l496g_disco_defconfig index d2d940208b5..c7582ad0d95 100644 --- a/boards/boards_legacy/arm/stm32l496g_disco/stm32l496g_disco_defconfig +++ b/boards/st/stm32l496g_disco/stm32l496g_disco_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L496XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/stm32l496g_disco/support/openocd.cfg b/boards/st/stm32l496g_disco/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32l496g_disco/support/openocd.cfg rename to boards/st/stm32l496g_disco/support/openocd.cfg