From 433db339f9f192773426042334e72f794e474537 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:06 +0000 Subject: [PATCH] boards: arm: ubx_evkannab1_nrf52832: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm/ubx_evkannab1_nrf52832/Kconfig.defconfig | 14 -------------- .../ubx_evkannab1}/Kconfig | 2 +- .../ubx_evkannab1/Kconfig.defconfig} | 9 ++++++--- boards/ublox/ubx_evkannab1/Kconfig.ubx_evkannab1 | 7 +++++++ .../ubx_evkannab1}/board.cmake | 0 boards/ublox/ubx_evkannab1/board.yml | 5 +++++ .../ubx_evkannab1}/doc/img/EVK-ANNA-B112.jpg | Bin .../ubx_evkannab1}/doc/index.rst | 6 +++--- .../ubx_evkannab1}/pre_dt_board.cmake | 0 .../ubx_evkannab1_nrf52832-pinctrl.dtsi | 0 .../ubx_evkannab1}/ubx_evkannab1_nrf52832.dts | 0 .../ubx_evkannab1}/ubx_evkannab1_nrf52832.yaml | 2 +- .../ubx_evkannab1_nrf52832_defconfig | 4 ---- 13 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/Kconfig (82%) rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.board => ublox/ubx_evkannab1/Kconfig.defconfig} (54%) create mode 100644 boards/ublox/ubx_evkannab1/Kconfig.ubx_evkannab1 rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/board.cmake (100%) create mode 100644 boards/ublox/ubx_evkannab1/board.yml rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/doc/img/EVK-ANNA-B112.jpg (100%) rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/doc/index.rst (96%) rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/pre_dt_board.cmake (100%) rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/ubx_evkannab1_nrf52832-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/ubx_evkannab1_nrf52832.dts (100%) rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/ubx_evkannab1_nrf52832.yaml (88%) rename boards/{boards_legacy/arm/ubx_evkannab1_nrf52832 => ublox/ubx_evkannab1}/ubx_evkannab1_nrf52832_defconfig (79%) diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig b/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig deleted file mode 100644 index eaac8eb95d9..00000000000 --- a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# u-blox EVK-ANNA-B1 board configuration -# -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_UBX_EVKANNAB1_NRF52832 - -config BOARD - default "ubx_evkannab1_nrf52832" - -config BT_CTLR - default BT - -endif # BOARD_UBX_EVKANNAB1_NRF52832 diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig b/boards/ublox/ubx_evkannab1/Kconfig similarity index 82% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig rename to boards/ublox/ubx_evkannab1/Kconfig index 3effcbce4e4..cba82a1d0b2 100644 --- a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig +++ b/boards/ublox/ubx_evkannab1/Kconfig @@ -7,4 +7,4 @@ config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_UBX_EVKANNAB1_NRF52832 + depends on BOARD_UBX_EVKANNAB1 diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.board b/boards/ublox/ubx_evkannab1/Kconfig.defconfig similarity index 54% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.board rename to boards/ublox/ubx_evkannab1/Kconfig.defconfig index 81a8fb291ba..e12e7d4ebac 100644 --- a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/Kconfig.board +++ b/boards/ublox/ubx_evkannab1/Kconfig.defconfig @@ -3,6 +3,9 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -config BOARD_UBX_EVKANNAB1_NRF52832 - bool "u-blox EVK-ANNA-B1" - depends on SOC_NRF52832_QFAA +if BOARD_UBX_EVKANNAB1 + +config BT_CTLR + default BT + +endif # BOARD_UBX_EVKANNAB1 diff --git a/boards/ublox/ubx_evkannab1/Kconfig.ubx_evkannab1 b/boards/ublox/ubx_evkannab1/Kconfig.ubx_evkannab1 new file mode 100644 index 00000000000..cb43df23647 --- /dev/null +++ b/boards/ublox/ubx_evkannab1/Kconfig.ubx_evkannab1 @@ -0,0 +1,7 @@ +# u-blox EVK-ANNA-B1 board configuration +# +# Copyright (c) 2021 u-blox AG +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_EVKANNAB1 + select SOC_NRF52832_QFAA diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/board.cmake b/boards/ublox/ubx_evkannab1/board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/board.cmake rename to boards/ublox/ubx_evkannab1/board.cmake diff --git a/boards/ublox/ubx_evkannab1/board.yml b/boards/ublox/ubx_evkannab1/board.yml new file mode 100644 index 00000000000..c19ebbb881c --- /dev/null +++ b/boards/ublox/ubx_evkannab1/board.yml @@ -0,0 +1,5 @@ +board: + name: ubx_evkannab1 + vendor: U-blox + socs: + - name: nrf52832 diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.jpg b/boards/ublox/ubx_evkannab1/doc/img/EVK-ANNA-B112.jpg similarity index 100% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.jpg rename to boards/ublox/ubx_evkannab1/doc/img/EVK-ANNA-B112.jpg diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/doc/index.rst b/boards/ublox/ubx_evkannab1/doc/index.rst similarity index 96% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/doc/index.rst rename to boards/ublox/ubx_evkannab1/doc/index.rst index 8a4702f331c..88ed4f55113 100644 --- a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/doc/index.rst +++ b/boards/ublox/ubx_evkannab1/doc/index.rst @@ -105,7 +105,7 @@ modules share the same pinout and can be interchanged. Programming and Debugging ************************* -Applications for the ``ubx_evkannab1_nrf52832`` board configuration can be +Applications for the ``ubx_evkannab1/nrf52832`` board configuration can be built and flashed in the usual way (see :ref:`build_an_application` and :ref:`application_run` for more details); however, the standard debugging targets are not currently available. @@ -127,7 +127,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: ubx_evkannab1_nrf52832 + :board: ubx_evkannab1/nrf52832 :goals: build flash Debugging @@ -150,7 +150,7 @@ and LEDs 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 and LED definitions can be found in -:zephyr_file:`boards/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832.dts`. +:zephyr_file:`boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832.dts`. Note that the buttons on the EVK-ANNA-B1 are marked SW1 and SW2, which are named sw0 and sw1 in the dts file. diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/pre_dt_board.cmake b/boards/ublox/ubx_evkannab1/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/pre_dt_board.cmake rename to boards/ublox/ubx_evkannab1/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832-pinctrl.dtsi b/boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832-pinctrl.dtsi rename to boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832.dts b/boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832.dts similarity index 100% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832.dts rename to boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832.dts diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832.yaml b/boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832.yaml similarity index 88% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832.yaml rename to boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832.yaml index 39de6903d44..54af92298d8 100644 --- a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832.yaml +++ b/boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832.yaml @@ -1,4 +1,4 @@ -identifier: ubx_evkannab1_nrf52832 +identifier: ubx_evkannab1/nrf52832 name: UBX-EVKANNAB1-NRF52832 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832_defconfig b/boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832_defconfig similarity index 79% rename from boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832_defconfig rename to boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832_defconfig index 95f9f59739f..5b7bfe0d28c 100644 --- a/boards/boards_legacy/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832_defconfig +++ b/boards/ublox/ubx_evkannab1/ubx_evkannab1_nrf52832_defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_UBX_EVKANNAB1_NRF52832=y - # Enable MPU CONFIG_ARM_MPU=y