From 4fee7371d21c747d2141494ace04d7d4715c899e Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:00 +0000 Subject: [PATCH] boards: arm: adafruit_itsybitsy_nrf52840: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../adafruit_itsybitsy}/Kconfig | 3 ++- .../adafruit_itsybitsy/Kconfig.adafruit_itsybitsy} | 7 ++++--- .../adafruit_itsybitsy}/Kconfig.defconfig | 7 ++----- .../adafruit_itsybitsy_nrf52840-pinctrl.dtsi | 0 .../adafruit_itsybitsy_nrf52840.dts | 0 .../adafruit_itsybitsy_nrf52840.yaml | 2 +- .../adafruit_itsybitsy_nrf52840_defconfig | 4 ---- .../adafruit_itsybitsy}/board.cmake | 0 boards/adafruit/adafruit_itsybitsy/board.yml | 5 +++++ .../doc/img/adafruit_itsybitsy_nrf52840.jpeg | Bin .../adafruit_itsybitsy}/doc/index.rst | 4 ++-- .../adafruit_itsybitsy}/pre_dt_board.cmake | 0 12 files changed, 16 insertions(+), 16 deletions(-) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/Kconfig (80%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig.board => adafruit/adafruit_itsybitsy/Kconfig.adafruit_itsybitsy} (59%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/Kconfig.defconfig (86%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/adafruit_itsybitsy_nrf52840-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/adafruit_itsybitsy_nrf52840.dts (100%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/adafruit_itsybitsy_nrf52840.yaml (86%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/adafruit_itsybitsy_nrf52840_defconfig (72%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/board.cmake (100%) create mode 100644 boards/adafruit/adafruit_itsybitsy/board.yml rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/doc/img/adafruit_itsybitsy_nrf52840.jpeg (100%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/doc/index.rst (97%) rename boards/{boards_legacy/arm/adafruit_itsybitsy_nrf52840 => adafruit/adafruit_itsybitsy}/pre_dt_board.cmake (100%) diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig b/boards/adafruit/adafruit_itsybitsy/Kconfig similarity index 80% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig rename to boards/adafruit/adafruit_itsybitsy/Kconfig index c01ef570cd5..e2c47273197 100644 --- a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig +++ b/boards/adafruit/adafruit_itsybitsy/Kconfig @@ -7,8 +7,9 @@ config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_ADAFRUIT_ITSYBITSY_NRF52840 + depends on BOARD_ADAFRUIT_ITSYBITSY config BOARD_SERIAL_BACKEND_CDC_ACM bool "USB CDC" default y + depends on BOARD_ADAFRUIT_ITSYBITSY diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig.board b/boards/adafruit/adafruit_itsybitsy/Kconfig.adafruit_itsybitsy similarity index 59% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig.board rename to boards/adafruit/adafruit_itsybitsy/Kconfig.adafruit_itsybitsy index f0a4444fd91..8b960f6e2fa 100644 --- a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig.board +++ b/boards/adafruit/adafruit_itsybitsy/Kconfig.adafruit_itsybitsy @@ -3,6 +3,7 @@ # Copyright (c) 2022 Embla Flatlandsmo # SPDX-License-Identifier: Apache-2.0 -config BOARD_ADAFRUIT_ITSYBITSY_NRF52840 - bool "Adafruit ItsyBitsy nRF52840 Express" - depends on SOC_NRF52840_QIAA +config BOARD_ADAFRUIT_ITSYBITSY + bool + default y + select SOC_NRF52840_QIAA diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig.defconfig b/boards/adafruit/adafruit_itsybitsy/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig.defconfig rename to boards/adafruit/adafruit_itsybitsy/Kconfig.defconfig index a31f72aa40d..b637497e148 100644 --- a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/Kconfig.defconfig +++ b/boards/adafruit/adafruit_itsybitsy/Kconfig.defconfig @@ -3,10 +3,7 @@ # Copyright (c) 2022 Embla Flatlandsmo # SPDX-License-Identifier: Apache-2.0 -if BOARD_ADAFRUIT_ITSYBITSY_NRF52840 - -config BOARD - default "adafruit_itsybitsy_nrf52840" +if BOARD_ADAFRUIT_ITSYBITSY config BT_CTLR default BT @@ -53,4 +50,4 @@ endif # LOG endif # BOARD_SERIAL_BACKEND_CDC_ACM -endif # BOARD_ADAFRUIT_ITSYBITSY_NRF52840 +endif # BOARD_ADAFRUIT_ITSYBITSY diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840-pinctrl.dtsi b/boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840-pinctrl.dtsi rename to boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840.dts b/boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840.dts similarity index 100% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840.dts rename to boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840.dts diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840.yaml b/boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840.yaml similarity index 86% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840.yaml rename to boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840.yaml index a95f91e9b12..3e571954bf1 100644 --- a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840.yaml +++ b/boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840.yaml @@ -1,4 +1,4 @@ -identifier: adafruit_itsybitsy_nrf52840 +identifier: adafruit_itsybitsy/nrf52840 name: Adafruit ItsyBitsy nRF52840 Express type: mcu arch: arm diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840_defconfig b/boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840_defconfig similarity index 72% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840_defconfig rename to boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840_defconfig index a88657578f3..f136674fc14 100644 --- a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840_defconfig +++ b/boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_ADAFRUIT_ITSYBITSY_NRF52840=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/board.cmake b/boards/adafruit/adafruit_itsybitsy/board.cmake similarity index 100% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/board.cmake rename to boards/adafruit/adafruit_itsybitsy/board.cmake diff --git a/boards/adafruit/adafruit_itsybitsy/board.yml b/boards/adafruit/adafruit_itsybitsy/board.yml new file mode 100644 index 00000000000..a62c6199095 --- /dev/null +++ b/boards/adafruit/adafruit_itsybitsy/board.yml @@ -0,0 +1,5 @@ +board: + name: adafruit_itsybitsy + vendor: Adafruit Industries LLC + socs: + - name: nrf52840 diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/doc/img/adafruit_itsybitsy_nrf52840.jpeg b/boards/adafruit/adafruit_itsybitsy/doc/img/adafruit_itsybitsy_nrf52840.jpeg similarity index 100% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/doc/img/adafruit_itsybitsy_nrf52840.jpeg rename to boards/adafruit/adafruit_itsybitsy/doc/img/adafruit_itsybitsy_nrf52840.jpeg diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/doc/index.rst b/boards/adafruit/adafruit_itsybitsy/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/doc/index.rst rename to boards/adafruit/adafruit_itsybitsy/doc/index.rst index aa28cb501c3..587739a5a8c 100644 --- a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/doc/index.rst +++ b/boards/adafruit/adafruit_itsybitsy/doc/index.rst @@ -127,7 +127,7 @@ with the :zephyr:code-sample:`led-apa102` sample application. 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/adafruit_itsybitsy_nrf52840/adafruit_itsybitsy_nrf52840.dts`. +:zephyr_file:`boards/adafruit/adafruit_itsybitsy/adafruit_itsybitsy_nrf52840.dts`. Programming and Debugging ************************* @@ -156,7 +156,7 @@ into the :code:`ITSY840BOOT` drive. .. zephyr-app-commands:: :zephyr-app: samples/basic/blinky - :board: adafruit_itsybitsy_nrf52840 + :board: adafruit_itsybitsy/nrf52840 :goals: build :compact: diff --git a/boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/pre_dt_board.cmake b/boards/adafruit/adafruit_itsybitsy/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/adafruit_itsybitsy_nrf52840/pre_dt_board.cmake rename to boards/adafruit/adafruit_itsybitsy/pre_dt_board.cmake