From 197a19f39614e8e480dc06601a8af93435526c93 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:09 +0000 Subject: [PATCH] boards: arm: ebyte_e73_tbb_nrf52832: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../ebyte_e73_tbb}/Kconfig.defconfig | 3 --- .../ebyte_e73_tbb/Kconfig.ebyte_e73_tbb} | 3 +-- .../ebyte_e73_tbb}/board.cmake | 0 boards/ebyte/ebyte_e73_tbb/board.yml | 5 +++++ .../doc/img/ebyte_e73_tbb_nrf52832.jpg | Bin .../ebyte_e73_tbb}/doc/index.rst | 6 +++--- .../ebyte_e73_tbb_nrf52832-pinctrl.dtsi | 0 .../ebyte_e73_tbb}/ebyte_e73_tbb_nrf52832.dts | 0 .../ebyte_e73_tbb}/ebyte_e73_tbb_nrf52832.yaml | 2 +- .../ebyte_e73_tbb}/ebyte_e73_tbb_nrf52832_defconfig | 4 ---- 10 files changed, 10 insertions(+), 13 deletions(-) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/Kconfig.defconfig (84%) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832/Kconfig.board => ebyte/ebyte_e73_tbb/Kconfig.ebyte_e73_tbb} (70%) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/board.cmake (100%) create mode 100644 boards/ebyte/ebyte_e73_tbb/board.yml rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/doc/img/ebyte_e73_tbb_nrf52832.jpg (100%) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/doc/index.rst (97%) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/ebyte_e73_tbb_nrf52832-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/ebyte_e73_tbb_nrf52832.dts (100%) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/ebyte_e73_tbb_nrf52832.yaml (85%) rename boards/{boards_legacy/arm/ebyte_e73_tbb_nrf52832 => ebyte/ebyte_e73_tbb}/ebyte_e73_tbb_nrf52832_defconfig (76%) diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/Kconfig.defconfig b/boards/ebyte/ebyte_e73_tbb/Kconfig.defconfig similarity index 84% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/Kconfig.defconfig rename to boards/ebyte/ebyte_e73_tbb/Kconfig.defconfig index 3638e0b0b4b..d3434e975a2 100644 --- a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/Kconfig.defconfig +++ b/boards/ebyte/ebyte_e73_tbb/Kconfig.defconfig @@ -6,9 +6,6 @@ if BOARD_EBYTE_E73_TBB_NRF52832 -config BOARD - default "ebyte_e73_tbb_nrf52832" - config BT_CTLR default BT diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/Kconfig.board b/boards/ebyte/ebyte_e73_tbb/Kconfig.ebyte_e73_tbb similarity index 70% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/Kconfig.board rename to boards/ebyte/ebyte_e73_tbb/Kconfig.ebyte_e73_tbb index 5c69a63bb09..8a04ffd502d 100644 --- a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/Kconfig.board +++ b/boards/ebyte/ebyte_e73_tbb/Kconfig.ebyte_e73_tbb @@ -4,5 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_EBYTE_E73_TBB_NRF52832 - bool "EBYTE E73-TBB NRF52832" - depends on SOC_NRF52832_QFAA + select SOC_NRF52832_QFAA diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/board.cmake b/boards/ebyte/ebyte_e73_tbb/board.cmake similarity index 100% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/board.cmake rename to boards/ebyte/ebyte_e73_tbb/board.cmake diff --git a/boards/ebyte/ebyte_e73_tbb/board.yml b/boards/ebyte/ebyte_e73_tbb/board.yml new file mode 100644 index 00000000000..1f1e4be71c6 --- /dev/null +++ b/boards/ebyte/ebyte_e73_tbb/board.yml @@ -0,0 +1,5 @@ +board: + name: ebyte_e73_tbb + vendor: Chengdu Ebyte Electronic Technology + socs: + - name: nrf52832 diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/doc/img/ebyte_e73_tbb_nrf52832.jpg b/boards/ebyte/ebyte_e73_tbb/doc/img/ebyte_e73_tbb_nrf52832.jpg similarity index 100% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/doc/img/ebyte_e73_tbb_nrf52832.jpg rename to boards/ebyte/ebyte_e73_tbb/doc/img/ebyte_e73_tbb_nrf52832.jpg diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/doc/index.rst b/boards/ebyte/ebyte_e73_tbb/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/doc/index.rst rename to boards/ebyte/ebyte_e73_tbb/doc/index.rst index 5b0f88f88a6..69388dcc5ee 100644 --- a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/doc/index.rst +++ b/boards/ebyte/ebyte_e73_tbb/doc/index.rst @@ -48,7 +48,7 @@ and solder NFC antenna using NFC_ANT connector. Supported Features ================== -The ebyte_e73_tbb_nrf52832 board configuration supports the following +The ebyte_e73_tbb/nrf52832 board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -188,7 +188,7 @@ to corresponding pins on your J-Link device, then build and flash the applicatio .. zephyr-app-commands:: :zephyr-app: samples/basic/blinky - :board: ebyte_e73_tbb_nrf52832 + :board: ebyte_e73_tbb/nrf52832 :goals: build flash Debugging @@ -211,7 +211,7 @@ 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 and LED definitions can be found in -:zephyr_file:`boards/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832.dts`. +:zephyr_file:`boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832.dts`. References ********** diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832-pinctrl.dtsi b/boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832-pinctrl.dtsi rename to boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832.dts b/boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832.dts similarity index 100% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832.dts rename to boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832.dts diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832.yaml b/boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832.yaml similarity index 85% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832.yaml rename to boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832.yaml index ba39fdbfc46..9311e76cff1 100644 --- a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832.yaml +++ b/boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832.yaml @@ -1,4 +1,4 @@ -identifier: ebyte_e73_tbb_nrf52832 +identifier: ebyte_e73_tbb/nrf52832 name: EBYTE-E73-TBB-NRF52832 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832_defconfig b/boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832_defconfig similarity index 76% rename from boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832_defconfig rename to boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832_defconfig index 8b9a09a8e8d..0ee25845f2e 100644 --- a/boards/boards_legacy/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832_defconfig +++ b/boards/ebyte/ebyte_e73_tbb/ebyte_e73_tbb_nrf52832_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_EBYTE_E73_TBB_NRF52832=y - # Enable MPU CONFIG_ARM_MPU=y