From d632b90043f94f8717a4d70d09bb2a6424fe9181 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:37:58 +0000 Subject: [PATCH] boards: arm: ubx_bmd360eval_nrf52811: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig | 11 ----------- .../ubx_bmd360eval}/Kconfig | 3 ++- .../ubx_bmd360eval/Kconfig.defconfig} | 6 +++--- boards/ublox/ubx_bmd360eval/Kconfig.ubx_bmd360eval | 9 +++++++++ .../ubx_bmd360eval}/board.cmake | 0 boards/ublox/ubx_bmd360eval/board.yml | 5 +++++ .../doc/img/BMD-30-33-35-36-EVAL.jpg | Bin .../doc/img/bmd-300-eval_pin_out.jpg | Bin .../ubx_bmd360eval}/doc/index.rst | 4 ++-- .../ubx_bmd360eval}/pre_dt_board.cmake | 0 .../ubx_bmd360eval_nrf52811-pinctrl.dtsi | 0 .../ubx_bmd360eval}/ubx_bmd360eval_nrf52811.dts | 0 .../ubx_bmd360eval}/ubx_bmd360eval_nrf52811.yaml | 2 +- .../ubx_bmd360eval_nrf52811_defconfig | 4 ---- 14 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/Kconfig (88%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.board => ublox/ubx_bmd360eval/Kconfig.defconfig} (52%) create mode 100644 boards/ublox/ubx_bmd360eval/Kconfig.ubx_bmd360eval rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/board.cmake (100%) create mode 100644 boards/ublox/ubx_bmd360eval/board.yml rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/doc/img/BMD-30-33-35-36-EVAL.jpg (100%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/doc/img/bmd-300-eval_pin_out.jpg (100%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/doc/index.rst (98%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/pre_dt_board.cmake (100%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/ubx_bmd360eval_nrf52811-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/ubx_bmd360eval_nrf52811.dts (100%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/ubx_bmd360eval_nrf52811.yaml (88%) rename boards/{boards_legacy/arm/ubx_bmd360eval_nrf52811 => ublox/ubx_bmd360eval}/ubx_bmd360eval_nrf52811_defconfig (79%) diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig b/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig deleted file mode 100644 index a604bf98cd4..00000000000 --- a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# BMD-360-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_UBX_BMD360EVAL_NRF52811 - -config BOARD - default "ubx_bmd360eval_nrf52811" - -endif # BOARD_UBX_BMD360EVAL_NRF52811 diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig b/boards/ublox/ubx_bmd360eval/Kconfig similarity index 88% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig rename to boards/ublox/ubx_bmd360eval/Kconfig index 53882dd3930..89f886d08e4 100644 --- a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig +++ b/boards/ublox/ubx_bmd360eval/Kconfig @@ -7,7 +7,8 @@ config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_UBX_BMD360EVAL_NRF52811 + depends on BOARD_UBX_BMD360EVAL + # BT_CTLR depends on BT. When BT is enabled we should default to also # enabling the controller. config BT_CTLR diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.board b/boards/ublox/ubx_bmd360eval/Kconfig.defconfig similarity index 52% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.board rename to boards/ublox/ubx_bmd360eval/Kconfig.defconfig index b041fc6a2c7..eb35b4bb152 100644 --- a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/Kconfig.board +++ b/boards/ublox/ubx_bmd360eval/Kconfig.defconfig @@ -3,6 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -config BOARD_UBX_BMD360EVAL_NRF52811 - bool "u-blox BMD-360-EVAL" - depends on SOC_NRF52811_QFAA +if BOARD_UBX_BMD360EVAL + +endif # BOARD_UBX_BMD360EVAL diff --git a/boards/ublox/ubx_bmd360eval/Kconfig.ubx_bmd360eval b/boards/ublox/ubx_bmd360eval/Kconfig.ubx_bmd360eval new file mode 100644 index 00000000000..321d8d6c5d3 --- /dev/null +++ b/boards/ublox/ubx_bmd360eval/Kconfig.ubx_bmd360eval @@ -0,0 +1,9 @@ +# BMD-360-EVAL board configuration + +# Copyright (c) 2021 u-blox AG +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD360EVAL + bool + default y + select SOC_NRF52811_QFAA diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/board.cmake b/boards/ublox/ubx_bmd360eval/board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/board.cmake rename to boards/ublox/ubx_bmd360eval/board.cmake diff --git a/boards/ublox/ubx_bmd360eval/board.yml b/boards/ublox/ubx_bmd360eval/board.yml new file mode 100644 index 00000000000..184cece0cd8 --- /dev/null +++ b/boards/ublox/ubx_bmd360eval/board.yml @@ -0,0 +1,5 @@ +board: + name: ubx_bmd360eval + vendor: U-blox + socs: + - name: nrf52811 diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.jpg b/boards/ublox/ubx_bmd360eval/doc/img/BMD-30-33-35-36-EVAL.jpg similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.jpg rename to boards/ublox/ubx_bmd360eval/doc/img/BMD-30-33-35-36-EVAL.jpg diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.jpg b/boards/ublox/ubx_bmd360eval/doc/img/bmd-300-eval_pin_out.jpg similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.jpg rename to boards/ublox/ubx_bmd360eval/doc/img/bmd-300-eval_pin_out.jpg diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/doc/index.rst b/boards/ublox/ubx_bmd360eval/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/doc/index.rst rename to boards/ublox/ubx_bmd360eval/doc/index.rst index c81d8b4ab7e..9ce29132c13 100644 --- a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/doc/index.rst +++ b/boards/ublox/ubx_bmd360eval/doc/index.rst @@ -353,7 +353,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: ubx_bmd360eval_nrf52811 + :board: ubx_bmd360eval/nrf52811 :goals: build flash Debugging @@ -376,7 +376,7 @@ There are 2 samples that allow you to test that the buttons 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_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811.dts`. +can be found in :zephyr_file:`boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811.dts`. References ********** diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/pre_dt_board.cmake b/boards/ublox/ubx_bmd360eval/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/pre_dt_board.cmake rename to boards/ublox/ubx_bmd360eval/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811-pinctrl.dtsi b/boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811-pinctrl.dtsi rename to boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811.dts b/boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811.dts similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811.dts rename to boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811.dts diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811.yaml b/boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811.yaml similarity index 88% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811.yaml rename to boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811.yaml index 3da084eb1ac..4df9c1172f0 100644 --- a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811.yaml +++ b/boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811.yaml @@ -1,4 +1,4 @@ -identifier: ubx_bmd360eval_nrf52811 +identifier: ubx_bmd360eval/nrf52811 name: UBX_BMD360EVAL_NRF52811 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811_defconfig b/boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811_defconfig similarity index 79% rename from boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811_defconfig rename to boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811_defconfig index 6cc16653c74..b2f60844ace 100644 --- a/boards/boards_legacy/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811_defconfig +++ b/boards/ublox/ubx_bmd360eval/ubx_bmd360eval_nrf52811_defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52811_QFAA=y -CONFIG_BOARD_UBX_BMD360EVAL_NRF52811=y - # Enable MPU CONFIG_ARM_MPU=y