From fdc3913e76c2adf66c37426ac67c821fb40426ee Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:10 +0000 Subject: [PATCH] boards: arm: ubx_evkninab1_nrf52832: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../ubx_evkninab1}/Kconfig | 2 +- .../ubx_evkninab1}/Kconfig.defconfig | 7 ++----- .../ubx_evkninab1/Kconfig.ubx_evkninab1} | 5 ++--- .../ubx_evkninab1}/board.cmake | 0 boards/ublox/ubx_evkninab1/board.yml | 5 +++++ .../ubx_evkninab1}/doc/img/EVK-NINA-B1.jpg | Bin .../ubx_evkninab1}/doc/index.rst | 8 ++++---- .../ubx_evkninab1}/pre_dt_board.cmake | 0 .../ubx_evkninab1_nrf52832-pinctrl.dtsi | 0 .../ubx_evkninab1}/ubx_evkninab1_nrf52832.dts | 0 .../ubx_evkninab1}/ubx_evkninab1_nrf52832.yaml | 2 +- .../ubx_evkninab1}/ubx_evkninab1_nrf52832_defconfig | 4 ---- 12 files changed, 15 insertions(+), 18 deletions(-) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/Kconfig (82%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/Kconfig.defconfig (54%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig.board => ublox/ubx_evkninab1/Kconfig.ubx_evkninab1} (54%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/board.cmake (100%) create mode 100644 boards/ublox/ubx_evkninab1/board.yml rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/doc/img/EVK-NINA-B1.jpg (100%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/doc/index.rst (96%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/pre_dt_board.cmake (100%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/ubx_evkninab1_nrf52832-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/ubx_evkninab1_nrf52832.dts (100%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/ubx_evkninab1_nrf52832.yaml (87%) rename boards/{boards_legacy/arm/ubx_evkninab1_nrf52832 => ublox/ubx_evkninab1}/ubx_evkninab1_nrf52832_defconfig (79%) diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig b/boards/ublox/ubx_evkninab1/Kconfig similarity index 82% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig rename to boards/ublox/ubx_evkninab1/Kconfig index a55e5f96934..280d583f721 100644 --- a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig +++ b/boards/ublox/ubx_evkninab1/Kconfig @@ -7,4 +7,4 @@ config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_UBX_EVKNINAB1_NRF52832 + depends on BOARD_UBX_EVKNINAB1 diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig.defconfig b/boards/ublox/ubx_evkninab1/Kconfig.defconfig similarity index 54% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig.defconfig rename to boards/ublox/ubx_evkninab1/Kconfig.defconfig index 408147057d1..5f897eb6bb1 100644 --- a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig.defconfig +++ b/boards/ublox/ubx_evkninab1/Kconfig.defconfig @@ -3,12 +3,9 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_EVKNINAB1_NRF52832 - -config BOARD - default "ubx_evkninab1_nrf52832" +if BOARD_UBX_EVKNINAB1 config BT_CTLR default BT -endif # BOARD_UBX_EVKNINAB1_NRF52832 +endif # BOARD_UBX_EVKNINAB1 diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig.board b/boards/ublox/ubx_evkninab1/Kconfig.ubx_evkninab1 similarity index 54% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig.board rename to boards/ublox/ubx_evkninab1/Kconfig.ubx_evkninab1 index e97367f358c..b221d0a7d22 100644 --- a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/Kconfig.board +++ b/boards/ublox/ubx_evkninab1/Kconfig.ubx_evkninab1 @@ -3,6 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -config BOARD_UBX_EVKNINAB1_NRF52832 - bool "u-blox EVK-NINA-B1" - depends on SOC_NRF52832_QFAA +config BOARD_UBX_EVKNINAB1 + select SOC_NRF52832_QFAA diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/board.cmake b/boards/ublox/ubx_evkninab1/board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/board.cmake rename to boards/ublox/ubx_evkninab1/board.cmake diff --git a/boards/ublox/ubx_evkninab1/board.yml b/boards/ublox/ubx_evkninab1/board.yml new file mode 100644 index 00000000000..17f962117cb --- /dev/null +++ b/boards/ublox/ubx_evkninab1/board.yml @@ -0,0 +1,5 @@ +board: + name: ubx_evkninab1 + vendor: U-blox + socs: + - name: nrf52832 diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/doc/img/EVK-NINA-B1.jpg b/boards/ublox/ubx_evkninab1/doc/img/EVK-NINA-B1.jpg similarity index 100% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/doc/img/EVK-NINA-B1.jpg rename to boards/ublox/ubx_evkninab1/doc/img/EVK-NINA-B1.jpg diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/doc/index.rst b/boards/ublox/ubx_evkninab1/doc/index.rst similarity index 96% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/doc/index.rst rename to boards/ublox/ubx_evkninab1/doc/index.rst index 666fdce7e5c..9b296624ad8 100644 --- a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/doc/index.rst +++ b/boards/ublox/ubx_evkninab1/doc/index.rst @@ -36,7 +36,7 @@ can be found at `NINA-B1 product page`_ and Supported Features ================== -The ubx_evkninab1_nrf52832 board configuration supports the +The ubx_evkninab1/nrf52832 board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -113,7 +113,7 @@ modules share the same pinout and can be interchanged, see Programming and Debugging ************************* -Applications for the ``ubx_evkninab1_nrf52832`` board configuration can be +Applications for the ``ubx_evkninab1/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. @@ -135,7 +135,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: ubx_evkninab1_nrf52832 + :board: ubx_evkninab1/nrf52832 :goals: build flash Debugging @@ -158,7 +158,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_evkninab1_nrf52832/ubx_evkninab1_nrf52832.dts`. +:zephyr_file:`boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832.dts`. Note that the buttons on the EVK-NINA-B1 are marked SW1 and SW2, which are named sw0 and sw1 in the dts file. diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/pre_dt_board.cmake b/boards/ublox/ubx_evkninab1/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/pre_dt_board.cmake rename to boards/ublox/ubx_evkninab1/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832-pinctrl.dtsi b/boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832-pinctrl.dtsi rename to boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832.dts b/boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832.dts similarity index 100% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832.dts rename to boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832.dts diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832.yaml b/boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832.yaml similarity index 87% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832.yaml rename to boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832.yaml index 125efd94a1c..286e66b97cb 100644 --- a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832.yaml +++ b/boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832.yaml @@ -1,4 +1,4 @@ -identifier: ubx_evkninab1_nrf52832 +identifier: ubx_evkninab1/nrf52832 name: UBX-EVKNINAB1-NRF52832 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832_defconfig b/boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832_defconfig similarity index 79% rename from boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832_defconfig rename to boards/ublox/ubx_evkninab1/ubx_evkninab1_nrf52832_defconfig index c23f9eb7833..9696c89e3d7 100644 --- a/boards/boards_legacy/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832_defconfig +++ b/boards/ublox/ubx_evkninab1/ubx_evkninab1_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_EVKNINAB1_NRF52832=y - # Enable MPU CONFIG_ARM_MPU=y