From c1ee449ef16886f18fde5945f08fae0e0a873342 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Thu, 8 Feb 2024 11:56:14 +0100 Subject: [PATCH] boards: Convert sensortile_box_pro to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm => st}/sensortile_box_pro/CMakeLists.txt | 0 .../arm => st}/sensortile_box_pro/Kconfig.defconfig | 3 --- .../sensortile_box_pro/Kconfig.sensortile_box_pro} | 5 +---- .../arm => st}/sensortile_box_pro/board.c | 0 .../arm => st}/sensortile_box_pro/board.cmake | 0 boards/st/sensortile_box_pro/board.yml | 5 +++++ .../doc/img/sensortile_box_pro.jpg | Bin .../arm => st}/sensortile_box_pro/doc/index.rst | 10 +++++----- .../sensortile_box_pro/sensortile_box_pro.dts | 0 .../sensortile_box_pro/sensortile_box_pro.yaml | 0 .../sensortile_box_pro/sensortile_box_pro_defconfig | 3 --- .../sensortile_box_pro/support/openocd.cfg | 0 12 files changed, 11 insertions(+), 15 deletions(-) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/CMakeLists.txt (100%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/Kconfig.defconfig (92%) rename boards/{boards_legacy/arm/sensortile_box_pro/Kconfig.board => st/sensortile_box_pro/Kconfig.sensortile_box_pro} (51%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/board.c (100%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/board.cmake (100%) create mode 100644 boards/st/sensortile_box_pro/board.yml rename boards/{boards_legacy/arm => st}/sensortile_box_pro/doc/img/sensortile_box_pro.jpg (100%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/doc/index.rst (97%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/sensortile_box_pro.dts (100%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/sensortile_box_pro.yaml (100%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/sensortile_box_pro_defconfig (92%) rename boards/{boards_legacy/arm => st}/sensortile_box_pro/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/sensortile_box_pro/CMakeLists.txt b/boards/st/sensortile_box_pro/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/arm/sensortile_box_pro/CMakeLists.txt rename to boards/st/sensortile_box_pro/CMakeLists.txt diff --git a/boards/boards_legacy/arm/sensortile_box_pro/Kconfig.defconfig b/boards/st/sensortile_box_pro/Kconfig.defconfig similarity index 92% rename from boards/boards_legacy/arm/sensortile_box_pro/Kconfig.defconfig rename to boards/st/sensortile_box_pro/Kconfig.defconfig index 48b55275be3..f0271728a9a 100644 --- a/boards/boards_legacy/arm/sensortile_box_pro/Kconfig.defconfig +++ b/boards/st/sensortile_box_pro/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_SENSORTILE_BOX_PRO -config BOARD - default "sensortile_box_pro" - if BT config SPI diff --git a/boards/boards_legacy/arm/sensortile_box_pro/Kconfig.board b/boards/st/sensortile_box_pro/Kconfig.sensortile_box_pro similarity index 51% rename from boards/boards_legacy/arm/sensortile_box_pro/Kconfig.board rename to boards/st/sensortile_box_pro/Kconfig.sensortile_box_pro index 14429705999..b0928107887 100644 --- a/boards/boards_legacy/arm/sensortile_box_pro/Kconfig.board +++ b/boards/st/sensortile_box_pro/Kconfig.sensortile_box_pro @@ -1,8 +1,5 @@ -# SENSORTILE_BOX_PRO board configuration - # Copyright (c) 2023 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 config BOARD_SENSORTILE_BOX_PRO - bool "SENSORTILE_BOX_PRO Board" - depends on SOC_STM32U585XX + select SOC_STM32U585XX diff --git a/boards/boards_legacy/arm/sensortile_box_pro/board.c b/boards/st/sensortile_box_pro/board.c similarity index 100% rename from boards/boards_legacy/arm/sensortile_box_pro/board.c rename to boards/st/sensortile_box_pro/board.c diff --git a/boards/boards_legacy/arm/sensortile_box_pro/board.cmake b/boards/st/sensortile_box_pro/board.cmake similarity index 100% rename from boards/boards_legacy/arm/sensortile_box_pro/board.cmake rename to boards/st/sensortile_box_pro/board.cmake diff --git a/boards/st/sensortile_box_pro/board.yml b/boards/st/sensortile_box_pro/board.yml new file mode 100644 index 00000000000..d3bb8ca9ee9 --- /dev/null +++ b/boards/st/sensortile_box_pro/board.yml @@ -0,0 +1,5 @@ +board: + name: sensortile_box_pro + vendor: st + socs: + - name: stm32u585xx diff --git a/boards/boards_legacy/arm/sensortile_box_pro/doc/img/sensortile_box_pro.jpg b/boards/st/sensortile_box_pro/doc/img/sensortile_box_pro.jpg similarity index 100% rename from boards/boards_legacy/arm/sensortile_box_pro/doc/img/sensortile_box_pro.jpg rename to boards/st/sensortile_box_pro/doc/img/sensortile_box_pro.jpg diff --git a/boards/boards_legacy/arm/sensortile_box_pro/doc/index.rst b/boards/st/sensortile_box_pro/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/sensortile_box_pro/doc/index.rst rename to boards/st/sensortile_box_pro/doc/index.rst index bba5a4cb288..e98ddace1bb 100644 --- a/boards/boards_legacy/arm/sensortile_box_pro/doc/index.rst +++ b/boards/st/sensortile_box_pro/doc/index.rst @@ -225,13 +225,13 @@ There are two possible options for Zephyr console output: To enable console and shell over UART - switch the console lines from cdc_acm to uart4 - (:file:`boards/arm/sensortile_box_pro/sensortile_box_pro.dts`) + (:file:`boards/st/sensortile_box_pro/sensortile_box_pro.dts`) - comment out the USB configuration macros - (:file:`boards/arm/sensortile_box_pro/sensortile_box_pro_defconfig`) + (:file:`boards/st/sensortile_box_pro/sensortile_box_pro_defconfig`) .. code-block:: dts - :caption: boards/arm/sensortile_box_pro/sensortile_box_pro.dts + :caption: boards/st/sensortile_box_pro/sensortile_box_pro.dts / { chosen { @@ -243,7 +243,7 @@ There are two possible options for Zephyr console output: }; .. code-block:: Kconfig - :caption: boards/arm/sensortile_box_pro/sensortile_box_pro_defconfig + :caption: boards/st/sensortile_box_pro/sensortile_box_pro_defconfig # Comment out following USB config lines when # switching console to UART @@ -258,7 +258,7 @@ There are two possible options for Zephyr console output: - through USB as USB CDC/ACM class. This is the default case present in the board dts file. .. code-block:: dts - :caption: boards/arm/sensortile_box_pro/sensortile_box_pro.dts + :caption: boards/st/sensortile_box_pro/sensortile_box_pro.dts / { chosen { diff --git a/boards/boards_legacy/arm/sensortile_box_pro/sensortile_box_pro.dts b/boards/st/sensortile_box_pro/sensortile_box_pro.dts similarity index 100% rename from boards/boards_legacy/arm/sensortile_box_pro/sensortile_box_pro.dts rename to boards/st/sensortile_box_pro/sensortile_box_pro.dts diff --git a/boards/boards_legacy/arm/sensortile_box_pro/sensortile_box_pro.yaml b/boards/st/sensortile_box_pro/sensortile_box_pro.yaml similarity index 100% rename from boards/boards_legacy/arm/sensortile_box_pro/sensortile_box_pro.yaml rename to boards/st/sensortile_box_pro/sensortile_box_pro.yaml diff --git a/boards/boards_legacy/arm/sensortile_box_pro/sensortile_box_pro_defconfig b/boards/st/sensortile_box_pro/sensortile_box_pro_defconfig similarity index 92% rename from boards/boards_legacy/arm/sensortile_box_pro/sensortile_box_pro_defconfig rename to boards/st/sensortile_box_pro/sensortile_box_pro_defconfig index 7a91dc1c195..a47f372d784 100644 --- a/boards/boards_legacy/arm/sensortile_box_pro/sensortile_box_pro_defconfig +++ b/boards/st/sensortile_box_pro/sensortile_box_pro_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32U5X=y -CONFIG_SOC_STM32U585XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/sensortile_box_pro/support/openocd.cfg b/boards/st/sensortile_box_pro/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/sensortile_box_pro/support/openocd.cfg rename to boards/st/sensortile_box_pro/support/openocd.cfg