From 719baa88509543043d057b75dc8462fc9be1f3b9 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 5 Feb 2024 10:43:10 +0000 Subject: [PATCH] boards: arm: cc1352r1_launchxl: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm/cc1352r1_launchxl/Kconfig.defconfig | 11 ----------- .../cc1352r1_launchxl/Kconfig.cc1352r1_launchxl} | 3 +-- .../arm => ti}/cc1352r1_launchxl/board.cmake | 0 boards/ti/cc1352r1_launchxl/board.yml | 5 +++++ .../cc1352r1_launchxl/boosterpack_connector.dtsi | 0 .../cc1352r1_launchxl-pinctrl.dtsi | 0 .../cc1352r1_launchxl/cc1352r1_launchxl.dts | 0 .../cc1352r1_launchxl/cc1352r1_launchxl.yaml | 0 .../cc1352r1_launchxl/cc1352r1_launchxl_defconfig | 3 --- .../cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg | Bin .../arm => ti}/cc1352r1_launchxl/doc/index.rst | 0 .../cc1352r1_launchxl/support/openocd.cfg | 0 12 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 boards/boards_legacy/arm/cc1352r1_launchxl/Kconfig.defconfig rename boards/{boards_legacy/arm/cc1352r1_launchxl/Kconfig.board => ti/cc1352r1_launchxl/Kconfig.cc1352r1_launchxl} (72%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/board.cmake (100%) create mode 100644 boards/ti/cc1352r1_launchxl/board.yml rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/boosterpack_connector.dtsi (100%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/cc1352r1_launchxl-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/cc1352r1_launchxl.dts (100%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/cc1352r1_launchxl.yaml (100%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/cc1352r1_launchxl_defconfig (82%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg (100%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/doc/index.rst (100%) rename boards/{boards_legacy/arm => ti}/cc1352r1_launchxl/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/Kconfig.defconfig b/boards/boards_legacy/arm/cc1352r1_launchxl/Kconfig.defconfig deleted file mode 100644 index 8bee2c9aed2..00000000000 --- a/boards/boards_legacy/arm/cc1352r1_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# TI CC1352R LaunchXL board - -# Copyright (c) 2019 Brett Witherspoon -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CC1352R1_LAUNCHXL - -config BOARD - default "cc1352r1_launchxl" - -endif # BOARD_CC1352R1_LAUNCHXL diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/Kconfig.board b/boards/ti/cc1352r1_launchxl/Kconfig.cc1352r1_launchxl similarity index 72% rename from boards/boards_legacy/arm/cc1352r1_launchxl/Kconfig.board rename to boards/ti/cc1352r1_launchxl/Kconfig.cc1352r1_launchxl index 3c874a13962..609bde5814f 100644 --- a/boards/boards_legacy/arm/cc1352r1_launchxl/Kconfig.board +++ b/boards/ti/cc1352r1_launchxl/Kconfig.cc1352r1_launchxl @@ -4,5 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_CC1352R1_LAUNCHXL - bool "TI CC1352R1 LaunchXL" - depends on SOC_CC1352R + select SOC_CC1352R diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/board.cmake b/boards/ti/cc1352r1_launchxl/board.cmake similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/board.cmake rename to boards/ti/cc1352r1_launchxl/board.cmake diff --git a/boards/ti/cc1352r1_launchxl/board.yml b/boards/ti/cc1352r1_launchxl/board.yml new file mode 100644 index 00000000000..8dc75fb87f8 --- /dev/null +++ b/boards/ti/cc1352r1_launchxl/board.yml @@ -0,0 +1,5 @@ +board: + name: cc1352r1_launchxl + vendor: Texas Instruments + socs: + - name: cc1352r diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/boosterpack_connector.dtsi b/boards/ti/cc1352r1_launchxl/boosterpack_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/boosterpack_connector.dtsi rename to boards/ti/cc1352r1_launchxl/boosterpack_connector.dtsi diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl-pinctrl.dtsi b/boards/ti/cc1352r1_launchxl/cc1352r1_launchxl-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl-pinctrl.dtsi rename to boards/ti/cc1352r1_launchxl/cc1352r1_launchxl-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl.dts b/boards/ti/cc1352r1_launchxl/cc1352r1_launchxl.dts similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl.dts rename to boards/ti/cc1352r1_launchxl/cc1352r1_launchxl.dts diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl.yaml b/boards/ti/cc1352r1_launchxl/cc1352r1_launchxl.yaml similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl.yaml rename to boards/ti/cc1352r1_launchxl/cc1352r1_launchxl.yaml diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig b/boards/ti/cc1352r1_launchxl/cc1352r1_launchxl_defconfig similarity index 82% rename from boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig rename to boards/ti/cc1352r1_launchxl/cc1352r1_launchxl_defconfig index 30e755d99f1..872843de16d 100644 --- a/boards/boards_legacy/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig +++ b/boards/ti/cc1352r1_launchxl/cc1352r1_launchxl_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_CC13X2_CC26X2=y -CONFIG_SOC_CC1352R=y -CONFIG_BOARD_CC1352R1_LAUNCHXL=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg b/boards/ti/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg rename to boards/ti/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/doc/index.rst b/boards/ti/cc1352r1_launchxl/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/doc/index.rst rename to boards/ti/cc1352r1_launchxl/doc/index.rst diff --git a/boards/boards_legacy/arm/cc1352r1_launchxl/support/openocd.cfg b/boards/ti/cc1352r1_launchxl/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/cc1352r1_launchxl/support/openocd.cfg rename to boards/ti/cc1352r1_launchxl/support/openocd.cfg