From dede0f6cd376580ac6a389c9e8857b32348a2294 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:07 +0000 Subject: [PATCH] boards: arm: nrf52_adafruit_feather: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm => adafruit}/nrf52_adafruit_feather/Kconfig | 0 .../nrf52_adafruit_feather/Kconfig.defconfig | 3 --- .../Kconfig.nrf52_adafruit_feather} | 3 +-- .../nrf52_adafruit_feather/board.cmake | 0 .../arm => adafruit}/nrf52_adafruit_feather/board.h | 0 boards/adafruit/nrf52_adafruit_feather/board.yml | 3 +++ .../doc/img/nrf52_adafruit_feather.jpg | Bin .../nrf52_adafruit_feather/doc/index.rst | 2 +- .../nrf52_adafruit_feather/feather_connector.dtsi | 0 .../nrf52_adafruit_feather-pinctrl.dtsi | 0 .../nrf52_adafruit_feather.dts | 0 .../nrf52_adafruit_feather.yaml | 0 .../nrf52_adafruit_feather_defconfig | 4 ---- .../nrf52_adafruit_feather/pre_dt_board.cmake | 0 boards/maker_diary/nrf52832_mdk/board.yml | 2 ++ 15 files changed, 7 insertions(+), 10 deletions(-) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/Kconfig (100%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/Kconfig.defconfig (81%) rename boards/{boards_legacy/arm/nrf52_adafruit_feather/Kconfig.board => adafruit/nrf52_adafruit_feather/Kconfig.nrf52_adafruit_feather} (71%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/board.cmake (100%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/board.h (100%) create mode 100644 boards/adafruit/nrf52_adafruit_feather/board.yml rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg (100%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/doc/index.rst (99%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/feather_connector.dtsi (100%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/nrf52_adafruit_feather-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/nrf52_adafruit_feather.dts (100%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/nrf52_adafruit_feather.yaml (100%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig (67%) rename boards/{boards_legacy/arm => adafruit}/nrf52_adafruit_feather/pre_dt_board.cmake (100%) diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig b/boards/adafruit/nrf52_adafruit_feather/Kconfig similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig rename to boards/adafruit/nrf52_adafruit_feather/Kconfig diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig.defconfig b/boards/adafruit/nrf52_adafruit_feather/Kconfig.defconfig similarity index 81% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig.defconfig rename to boards/adafruit/nrf52_adafruit_feather/Kconfig.defconfig index c75ff94e520..48cb9d7332d 100644 --- a/boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig.defconfig +++ b/boards/adafruit/nrf52_adafruit_feather/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_NRF52_ADAFRUIT_FEATHER -config BOARD - default "nrf52_adafruit_feather" - config BT_CTLR default BT diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig.board b/boards/adafruit/nrf52_adafruit_feather/Kconfig.nrf52_adafruit_feather similarity index 71% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig.board rename to boards/adafruit/nrf52_adafruit_feather/Kconfig.nrf52_adafruit_feather index 0f629d853df..d2d1b26de92 100644 --- a/boards/boards_legacy/arm/nrf52_adafruit_feather/Kconfig.board +++ b/boards/adafruit/nrf52_adafruit_feather/Kconfig.nrf52_adafruit_feather @@ -4,5 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_NRF52_ADAFRUIT_FEATHER - bool "nRF52 ADAFRUIT FEATHER" - depends on SOC_NRF52832_QFAA + select SOC_NRF52832_QFAA diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/board.cmake b/boards/adafruit/nrf52_adafruit_feather/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/board.cmake rename to boards/adafruit/nrf52_adafruit_feather/board.cmake diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/board.h b/boards/adafruit/nrf52_adafruit_feather/board.h similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/board.h rename to boards/adafruit/nrf52_adafruit_feather/board.h diff --git a/boards/adafruit/nrf52_adafruit_feather/board.yml b/boards/adafruit/nrf52_adafruit_feather/board.yml new file mode 100644 index 00000000000..ecc5c389200 --- /dev/null +++ b/boards/adafruit/nrf52_adafruit_feather/board.yml @@ -0,0 +1,3 @@ +board: + name: nrf52_adafruit_feather + vendor: Adafruit Industries LLC diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg b/boards/adafruit/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg rename to boards/adafruit/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/doc/index.rst b/boards/adafruit/nrf52_adafruit_feather/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/doc/index.rst rename to boards/adafruit/nrf52_adafruit_feather/doc/index.rst index 3555803b449..0e7680e70b8 100644 --- a/boards/boards_legacy/arm/nrf52_adafruit_feather/doc/index.rst +++ b/boards/adafruit/nrf52_adafruit_feather/doc/index.rst @@ -174,7 +174,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/nrf52_adafruit_feather/board.h`. +:zephyr_file:`boards/adafruit/nrf52_adafruit_feather/board.h`. References diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/feather_connector.dtsi b/boards/adafruit/nrf52_adafruit_feather/feather_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/feather_connector.dtsi rename to boards/adafruit/nrf52_adafruit_feather/feather_connector.dtsi diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather-pinctrl.dtsi b/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather-pinctrl.dtsi rename to boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts b/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.dts similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts rename to boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.dts diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.yaml b/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.yaml similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.yaml rename to boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.yaml diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig b/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig similarity index 67% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig rename to boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig index b434b22401d..7167aca850a 100644 --- a/boards/boards_legacy/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig +++ b/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52_ADAFRUIT_FEATHER=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nrf52_adafruit_feather/pre_dt_board.cmake b/boards/adafruit/nrf52_adafruit_feather/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf52_adafruit_feather/pre_dt_board.cmake rename to boards/adafruit/nrf52_adafruit_feather/pre_dt_board.cmake diff --git a/boards/maker_diary/nrf52832_mdk/board.yml b/boards/maker_diary/nrf52832_mdk/board.yml index 1cde1839b9e..09886ad7510 100644 --- a/boards/maker_diary/nrf52832_mdk/board.yml +++ b/boards/maker_diary/nrf52832_mdk/board.yml @@ -1,3 +1,5 @@ board: name: nrf52832_mdk vendor: Maker Diary + socs: + - name: nrf52832