From 44b67ac430a0c69ba3f5fa396b86bf9234db81d0 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:00 +0000 Subject: [PATCH] boards: arm: bt610: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm => laird_connect}/bt610/Kconfig | 0 .../bt610/Kconfig.bt610} | 5 +++-- .../arm => laird_connect}/bt610/Kconfig.defconfig | 3 --- .../arm => laird_connect}/bt610/board.cmake | 0 boards/laird_connect/bt610/board.yml | 5 +++++ .../arm => laird_connect}/bt610/bt610-pinctrl.dtsi | 0 .../arm => laird_connect}/bt610/bt610.dts | 0 .../arm => laird_connect}/bt610/bt610.yaml | 0 .../arm => laird_connect}/bt610/bt610_defconfig | 4 ---- .../arm => laird_connect}/bt610/doc/bt610.rst | 2 +- .../bt610/doc/img/bt610_back.jpg | Bin .../bt610/doc/img/bt610_board.jpg | Bin .../bt610/doc/img/bt610_front.jpg | Bin .../arm => laird_connect}/bt610/pre_dt_board.cmake | 0 14 files changed, 9 insertions(+), 10 deletions(-) rename boards/{boards_legacy/arm => laird_connect}/bt610/Kconfig (100%) rename boards/{boards_legacy/arm/bt610/Kconfig.board => laird_connect/bt610/Kconfig.bt610} (74%) rename boards/{boards_legacy/arm => laird_connect}/bt610/Kconfig.defconfig (88%) rename boards/{boards_legacy/arm => laird_connect}/bt610/board.cmake (100%) create mode 100644 boards/laird_connect/bt610/board.yml rename boards/{boards_legacy/arm => laird_connect}/bt610/bt610-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => laird_connect}/bt610/bt610.dts (100%) rename boards/{boards_legacy/arm => laird_connect}/bt610/bt610.yaml (100%) rename boards/{boards_legacy/arm => laird_connect}/bt610/bt610_defconfig (82%) rename boards/{boards_legacy/arm => laird_connect}/bt610/doc/bt610.rst (99%) rename boards/{boards_legacy/arm => laird_connect}/bt610/doc/img/bt610_back.jpg (100%) rename boards/{boards_legacy/arm => laird_connect}/bt610/doc/img/bt610_board.jpg (100%) rename boards/{boards_legacy/arm => laird_connect}/bt610/doc/img/bt610_front.jpg (100%) rename boards/{boards_legacy/arm => laird_connect}/bt610/pre_dt_board.cmake (100%) diff --git a/boards/boards_legacy/arm/bt610/Kconfig b/boards/laird_connect/bt610/Kconfig similarity index 100% rename from boards/boards_legacy/arm/bt610/Kconfig rename to boards/laird_connect/bt610/Kconfig diff --git a/boards/boards_legacy/arm/bt610/Kconfig.board b/boards/laird_connect/bt610/Kconfig.bt610 similarity index 74% rename from boards/boards_legacy/arm/bt610/Kconfig.board rename to boards/laird_connect/bt610/Kconfig.bt610 index cee1953cf31..ba9c9cf8692 100644 --- a/boards/boards_legacy/arm/bt610/Kconfig.board +++ b/boards/laird_connect/bt610/Kconfig.bt610 @@ -4,5 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_BT610 - bool "BT610" - depends on SOC_NRF52840_QIAA + bool + default y + select SOC_NRF52840_QIAA diff --git a/boards/boards_legacy/arm/bt610/Kconfig.defconfig b/boards/laird_connect/bt610/Kconfig.defconfig similarity index 88% rename from boards/boards_legacy/arm/bt610/Kconfig.defconfig rename to boards/laird_connect/bt610/Kconfig.defconfig index 34620afc27f..9a82770655e 100644 --- a/boards/boards_legacy/arm/bt610/Kconfig.defconfig +++ b/boards/laird_connect/bt610/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BT610 -config BOARD - default "bt610" - config BT_CTLR default BT diff --git a/boards/boards_legacy/arm/bt610/board.cmake b/boards/laird_connect/bt610/board.cmake similarity index 100% rename from boards/boards_legacy/arm/bt610/board.cmake rename to boards/laird_connect/bt610/board.cmake diff --git a/boards/laird_connect/bt610/board.yml b/boards/laird_connect/bt610/board.yml new file mode 100644 index 00000000000..4ada3ce167b --- /dev/null +++ b/boards/laird_connect/bt610/board.yml @@ -0,0 +1,5 @@ +board: + name: bt610 + vendor: Laird Connectivity + socs: + - name: nrf52840 diff --git a/boards/boards_legacy/arm/bt610/bt610-pinctrl.dtsi b/boards/laird_connect/bt610/bt610-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/bt610/bt610-pinctrl.dtsi rename to boards/laird_connect/bt610/bt610-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/bt610/bt610.dts b/boards/laird_connect/bt610/bt610.dts similarity index 100% rename from boards/boards_legacy/arm/bt610/bt610.dts rename to boards/laird_connect/bt610/bt610.dts diff --git a/boards/boards_legacy/arm/bt610/bt610.yaml b/boards/laird_connect/bt610/bt610.yaml similarity index 100% rename from boards/boards_legacy/arm/bt610/bt610.yaml rename to boards/laird_connect/bt610/bt610.yaml diff --git a/boards/boards_legacy/arm/bt610/bt610_defconfig b/boards/laird_connect/bt610/bt610_defconfig similarity index 82% rename from boards/boards_legacy/arm/bt610/bt610_defconfig rename to boards/laird_connect/bt610/bt610_defconfig index 531ba015b1e..3bff5fbaeb5 100644 --- a/boards/boards_legacy/arm/bt610/bt610_defconfig +++ b/boards/laird_connect/bt610/bt610_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_BT610=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/bt610/doc/bt610.rst b/boards/laird_connect/bt610/doc/bt610.rst similarity index 99% rename from boards/boards_legacy/arm/bt610/doc/bt610.rst rename to boards/laird_connect/bt610/doc/bt610.rst index 2fe7d7ad931..25798b12810 100644 --- a/boards/boards_legacy/arm/bt610/doc/bt610.rst +++ b/boards/laird_connect/bt610/doc/bt610.rst @@ -598,7 +598,7 @@ on the board are working properly with Zephyr: You can build and flash the examples to make sure Zephyr is running correctly on your board. The button, LED and sensor device definitions can be found in -:zephyr_file:`boards/arm/bt610/bt610.dts`. +:zephyr_file:`boards/laird_connect/bt610/bt610.dts`. References diff --git a/boards/boards_legacy/arm/bt610/doc/img/bt610_back.jpg b/boards/laird_connect/bt610/doc/img/bt610_back.jpg similarity index 100% rename from boards/boards_legacy/arm/bt610/doc/img/bt610_back.jpg rename to boards/laird_connect/bt610/doc/img/bt610_back.jpg diff --git a/boards/boards_legacy/arm/bt610/doc/img/bt610_board.jpg b/boards/laird_connect/bt610/doc/img/bt610_board.jpg similarity index 100% rename from boards/boards_legacy/arm/bt610/doc/img/bt610_board.jpg rename to boards/laird_connect/bt610/doc/img/bt610_board.jpg diff --git a/boards/boards_legacy/arm/bt610/doc/img/bt610_front.jpg b/boards/laird_connect/bt610/doc/img/bt610_front.jpg similarity index 100% rename from boards/boards_legacy/arm/bt610/doc/img/bt610_front.jpg rename to boards/laird_connect/bt610/doc/img/bt610_front.jpg diff --git a/boards/boards_legacy/arm/bt610/pre_dt_board.cmake b/boards/laird_connect/bt610/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/bt610/pre_dt_board.cmake rename to boards/laird_connect/bt610/pre_dt_board.cmake