From adab07c42fc0d3a2f926c398e20a808f125c6479 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 9 Feb 2024 12:28:36 +0000 Subject: [PATCH] boards: Convert msp_exp432p401r_launchxl to HWM v2 Port the board to HWMv2. Signed-off-by: Jamie McCrae --- .../arm/msp_exp432p401r_launchxl/Kconfig | 7 ------- .../arm/msp_exp432p401r_launchxl/Kconfig.defconfig | 7 ------- .../Kconfig.msp_exp432p401r_launchxl} | 3 +-- .../arm => ti}/msp_exp432p401r_launchxl/board.cmake | 0 boards/ti/msp_exp432p401r_launchxl/board.yml | 5 +++++ .../doc/img/msp_exp432p401r_launchxl.jpg | Bin .../msp_exp432p401r_launchxl/doc/index.rst | 2 +- .../msp_exp432p401r_launchxl.dts | 0 .../msp_exp432p401r_launchxl.yaml | 0 .../msp_exp432p401r_launchxl_defconfig | 3 --- .../msp_exp432p401r_launchxl/support/openocd.cfg | 0 11 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig delete mode 100644 boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.defconfig rename boards/{boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.board => ti/msp_exp432p401r_launchxl/Kconfig.msp_exp432p401r_launchxl} (68%) rename boards/{boards_legacy/arm => ti}/msp_exp432p401r_launchxl/board.cmake (100%) create mode 100644 boards/ti/msp_exp432p401r_launchxl/board.yml rename boards/{boards_legacy/arm => ti}/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg (100%) rename boards/{boards_legacy/arm => ti}/msp_exp432p401r_launchxl/doc/index.rst (98%) rename boards/{boards_legacy/arm => ti}/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.dts (100%) rename boards/{boards_legacy/arm => ti}/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.yaml (100%) rename boards/{boards_legacy/arm => ti}/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig (67%) rename boards/{boards_legacy/arm => ti}/msp_exp432p401r_launchxl/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig b/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig deleted file mode 100644 index 13d6b2ad41a..00000000000 --- a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -# TI MSP-EXP432P401R LaunchXL configuration - -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_MSP_EXP432P401R_LAUNCHXL - -endif # BOARD_MSP_EXP432P401R_LAUNCHXL diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.defconfig b/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.defconfig deleted file mode 100644 index f3a70f2bb6b..00000000000 --- a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# TI MSP-EXP432P401R LaunchXL development board configuration - -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "msp_exp432p401r_launchxl" - depends on BOARD_MSP_EXP432P401R_LAUNCHXL diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.board b/boards/ti/msp_exp432p401r_launchxl/Kconfig.msp_exp432p401r_launchxl similarity index 68% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.board rename to boards/ti/msp_exp432p401r_launchxl/Kconfig.msp_exp432p401r_launchxl index 3a15e56a5d4..e1c7c97ac15 100644 --- a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/Kconfig.board +++ b/boards/ti/msp_exp432p401r_launchxl/Kconfig.msp_exp432p401r_launchxl @@ -3,5 +3,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_MSP_EXP432P401R_LAUNCHXL - bool "TI MSP-EXP432P401R LAUNCHXL" - depends on SOC_MSP432P401R + select SOC_MSP432P401R diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/board.cmake b/boards/ti/msp_exp432p401r_launchxl/board.cmake similarity index 100% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/board.cmake rename to boards/ti/msp_exp432p401r_launchxl/board.cmake diff --git a/boards/ti/msp_exp432p401r_launchxl/board.yml b/boards/ti/msp_exp432p401r_launchxl/board.yml new file mode 100644 index 00000000000..eddd3117fac --- /dev/null +++ b/boards/ti/msp_exp432p401r_launchxl/board.yml @@ -0,0 +1,5 @@ +board: + name: msp_exp432p401r_launchxl + vendor: Texas Instruments + socs: + - name: msp432p401r diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg b/boards/ti/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg similarity index 100% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg rename to boards/ti/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/doc/index.rst b/boards/ti/msp_exp432p401r_launchxl/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/doc/index.rst rename to boards/ti/msp_exp432p401r_launchxl/doc/index.rst index d2a2e12153a..e24d8140a25 100644 --- a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/doc/index.rst +++ b/boards/ti/msp_exp432p401r_launchxl/doc/index.rst @@ -84,7 +84,7 @@ Prerequisites: the one in the Zephyr SDK. If for some reason you wish to continue to use your TI OpenOCD installation, you can set the OPENOCD and OPENOCD_DEFAULT_PATH variables in - :zephyr_file:`boards/arm/msp_exp432p401r_launchxl/board.cmake` to point the build + :zephyr_file:`boards/ti/msp_exp432p401r_launchxl/board.cmake` to point the build to the paths of the OpenOCD binary and its scripts, before including the common openocd.board.cmake file: diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.dts b/boards/ti/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.dts similarity index 100% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.dts rename to boards/ti/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.dts diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.yaml b/boards/ti/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.yaml similarity index 100% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.yaml rename to boards/ti/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl.yaml diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig b/boards/ti/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig similarity index 67% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig rename to boards/ti/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig index 01559c8be94..2aeb5be29de 100644 --- a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig +++ b/boards/ti/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_MSP_EXP432P401R_LAUNCHXL=y -CONFIG_SOC_SERIES_MSP432P4XX=y -CONFIG_SOC_MSP432P401R=y CONFIG_BUILD_OUTPUT_HEX=y # Floating point options diff --git a/boards/boards_legacy/arm/msp_exp432p401r_launchxl/support/openocd.cfg b/boards/ti/msp_exp432p401r_launchxl/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/msp_exp432p401r_launchxl/support/openocd.cfg rename to boards/ti/msp_exp432p401r_launchxl/support/openocd.cfg