From 28f3f25945beb1e08e0ac8bd69d70944543de04f Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 5 Feb 2024 11:14:26 +0000 Subject: [PATCH] boards: arm: cc3235sf_launchxl: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm/cc3235sf_launchxl/Kconfig.defconfig | 11 ----------- .../cc3235sf_launchxl_defconfig | 17 ----------------- .../arm => ti}/cc3235sf_launchxl/CMakeLists.txt | 0 .../Kconfig.cc3235sf_launchxl} | 4 +--- .../arm => ti}/cc3235sf_launchxl/board.cmake | 0 boards/ti/cc3235sf_launchxl/board.yml | 5 +++++ .../cc3235sf_launchxl-pinctrl.dtsi | 0 .../cc3235sf_launchxl/cc3235sf_launchxl.dts | 0 .../cc3235sf_launchxl/cc3235sf_launchxl.yaml | 0 .../cc3235sf_launchxl_defconfig | 13 +++++++++++++ .../arm => ti}/cc3235sf_launchxl/dbghdr.c | 0 .../arm => ti}/cc3235sf_launchxl/doc/index.rst | 6 +++--- .../cc3235sf_launchxl/support/openocd.cfg | 0 13 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 boards/boards_legacy/arm/cc3235sf_launchxl/Kconfig.defconfig delete mode 100644 boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/CMakeLists.txt (100%) rename boards/{boards_legacy/arm/cc3235sf_launchxl/Kconfig.board => ti/cc3235sf_launchxl/Kconfig.cc3235sf_launchxl} (74%) rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/board.cmake (100%) create mode 100644 boards/ti/cc3235sf_launchxl/board.yml rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/cc3235sf_launchxl-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/cc3235sf_launchxl.dts (100%) rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/cc3235sf_launchxl.yaml (100%) create mode 100644 boards/ti/cc3235sf_launchxl/cc3235sf_launchxl_defconfig rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/dbghdr.c (100%) rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/doc/index.rst (98%) rename boards/{boards_legacy/arm => ti}/cc3235sf_launchxl/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/Kconfig.defconfig b/boards/boards_legacy/arm/cc3235sf_launchxl/Kconfig.defconfig deleted file mode 100644 index 36537918865..00000000000 --- a/boards/boards_legacy/arm/cc3235sf_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# TI CC3235SF LaunchXL board configuration - -# Copyright (c) 2019, Texas Instruments Incorporated -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CC3235SF_LAUNCHXL - -config BOARD - default "cc3235sf_launchxl" - -endif # BOARD_CC3235SF_LAUNCHXL diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig b/boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig deleted file mode 100644 index a233de474a7..00000000000 --- a/boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_BOARD_CC3235SF_LAUNCHXL=y -CONFIG_SOC_SERIES_CC32XX=y -CONFIG_SOC_CC3235SF=y -CONFIG_BUILD_OUTPUT_HEX=y - - -#enable GPIO driver -CONFIG_GPIO=y - -# enable uart driver -CONFIG_SERIAL=y - -# enable console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/CMakeLists.txt b/boards/ti/cc3235sf_launchxl/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/arm/cc3235sf_launchxl/CMakeLists.txt rename to boards/ti/cc3235sf_launchxl/CMakeLists.txt diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/Kconfig.board b/boards/ti/cc3235sf_launchxl/Kconfig.cc3235sf_launchxl similarity index 74% rename from boards/boards_legacy/arm/cc3235sf_launchxl/Kconfig.board rename to boards/ti/cc3235sf_launchxl/Kconfig.cc3235sf_launchxl index b119bc17456..c4a04b2d293 100644 --- a/boards/boards_legacy/arm/cc3235sf_launchxl/Kconfig.board +++ b/boards/ti/cc3235sf_launchxl/Kconfig.cc3235sf_launchxl @@ -1,8 +1,6 @@ # TI SimpleLink CC3235SF LaunchXL Board - # Copyright (c) 2019, Texas Instruments Incorporated # SPDX-License-Identifier: Apache-2.0 config BOARD_CC3235SF_LAUNCHXL - bool "TI CC3235SF LAUNCHXL" - depends on SOC_CC3235SF + select SOC_CC3235SF diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/board.cmake b/boards/ti/cc3235sf_launchxl/board.cmake similarity index 100% rename from boards/boards_legacy/arm/cc3235sf_launchxl/board.cmake rename to boards/ti/cc3235sf_launchxl/board.cmake diff --git a/boards/ti/cc3235sf_launchxl/board.yml b/boards/ti/cc3235sf_launchxl/board.yml new file mode 100644 index 00000000000..d398dc9c343 --- /dev/null +++ b/boards/ti/cc3235sf_launchxl/board.yml @@ -0,0 +1,5 @@ +board: + name: cc3235sf_launchxl + vendor: Texas Instruments + socs: + - name: cc3235sf diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl-pinctrl.dtsi b/boards/ti/cc3235sf_launchxl/cc3235sf_launchxl-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl-pinctrl.dtsi rename to boards/ti/cc3235sf_launchxl/cc3235sf_launchxl-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl.dts b/boards/ti/cc3235sf_launchxl/cc3235sf_launchxl.dts similarity index 100% rename from boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl.dts rename to boards/ti/cc3235sf_launchxl/cc3235sf_launchxl.dts diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl.yaml b/boards/ti/cc3235sf_launchxl/cc3235sf_launchxl.yaml similarity index 100% rename from boards/boards_legacy/arm/cc3235sf_launchxl/cc3235sf_launchxl.yaml rename to boards/ti/cc3235sf_launchxl/cc3235sf_launchxl.yaml diff --git a/boards/ti/cc3235sf_launchxl/cc3235sf_launchxl_defconfig b/boards/ti/cc3235sf_launchxl/cc3235sf_launchxl_defconfig new file mode 100644 index 00000000000..acbb196bc4e --- /dev/null +++ b/boards/ti/cc3235sf_launchxl/cc3235sf_launchxl_defconfig @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_BUILD_OUTPUT_HEX=y + +# Enable GPIO driver +CONFIG_GPIO=y + +# Enable UART driver +CONFIG_SERIAL=y + +# Enable console +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/dbghdr.c b/boards/ti/cc3235sf_launchxl/dbghdr.c similarity index 100% rename from boards/boards_legacy/arm/cc3235sf_launchxl/dbghdr.c rename to boards/ti/cc3235sf_launchxl/dbghdr.c diff --git a/boards/boards_legacy/arm/cc3235sf_launchxl/doc/index.rst b/boards/ti/cc3235sf_launchxl/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/cc3235sf_launchxl/doc/index.rst rename to boards/ti/cc3235sf_launchxl/doc/index.rst index 80a4fb3c0e9..665bd2e3f7d 100644 --- a/boards/boards_legacy/arm/cc3235sf_launchxl/doc/index.rst +++ b/boards/ti/cc3235sf_launchxl/doc/index.rst @@ -75,7 +75,7 @@ Connections and IOs ==================== Peripherals on the CC3235SF LaunchXL are mapped to the following pins in -the file :zephyr_file:`boards/arm/cc3235sf_launchxl/pinmux.c`. +the file :zephyr_file:`boards/ti/cc3235sf_launchxl/pinmux.c`. +------------+-------+-------+ | Function | PIN | GPIO | @@ -96,7 +96,7 @@ the file :zephyr_file:`boards/arm/cc3235sf_launchxl/pinmux.c`. +------------+-------+-------+ The default configuration can be found in the Kconfig file at -:zephyr_file:`boards/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig`. +:zephyr_file:`boards/ti/cc3235sf_launchxl/cc3235sf_launchxl_defconfig`. Programming and Debugging @@ -168,7 +168,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/cc3220sf_launchxl/board.cmake` to point the build + :zephyr_file:`boards/ti/cc3220sf_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/cc3235sf_launchxl/support/openocd.cfg b/boards/ti/cc3235sf_launchxl/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/cc3235sf_launchxl/support/openocd.cfg rename to boards/ti/cc3235sf_launchxl/support/openocd.cfg