diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig.defconfig b/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig.defconfig deleted file mode 100644 index 7168f408f39..00000000000 --- a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# BMD-330-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_UBX_BMD330EVAL_NRF52810 - -config BOARD - default "ubx_bmd330eval_nrf52810" - -endif # BOARD_UBX_BMD330EVAL_NRF52810 diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig b/boards/ublox/ubx_bmd330eval/Kconfig similarity index 88% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig rename to boards/ublox/ubx_bmd330eval/Kconfig index cb7241f9b71..af68ffe247b 100644 --- a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig +++ b/boards/ublox/ubx_bmd330eval/Kconfig @@ -7,7 +7,7 @@ config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_UBX_BMD330EVAL_NRF52810 + depends on BOARD_UBX_BMD330EVAL # BT_CTLR depends on BT. When BT is enabled we should default to also # enabling the controller. diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig.board b/boards/ublox/ubx_bmd330eval/Kconfig.defconfig similarity index 52% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig.board rename to boards/ublox/ubx_bmd330eval/Kconfig.defconfig index fa39a7e9bff..3f43013dd27 100644 --- a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/Kconfig.board +++ b/boards/ublox/ubx_bmd330eval/Kconfig.defconfig @@ -3,6 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -config BOARD_UBX_BMD330EVAL_NRF52810 - bool "u-blox BMD-330-EVAL" - depends on SOC_NRF52810_QFAA +if BOARD_UBX_BMD330EVAL + +endif # BOARD_UBX_BMD330EVAL diff --git a/boards/ublox/ubx_bmd330eval/Kconfig.ubx_bmd330eval b/boards/ublox/ubx_bmd330eval/Kconfig.ubx_bmd330eval new file mode 100644 index 00000000000..a9a14b45260 --- /dev/null +++ b/boards/ublox/ubx_bmd330eval/Kconfig.ubx_bmd330eval @@ -0,0 +1,9 @@ +# BMD-330-EVAL board configuration + +# Copyright (c) 2021 u-blox AG +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD330EVAL + bool + default y + select SOC_NRF52810_QFAA diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/board.cmake b/boards/ublox/ubx_bmd330eval/board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/board.cmake rename to boards/ublox/ubx_bmd330eval/board.cmake diff --git a/boards/ublox/ubx_bmd330eval/board.yml b/boards/ublox/ubx_bmd330eval/board.yml new file mode 100644 index 00000000000..496efdfaa46 --- /dev/null +++ b/boards/ublox/ubx_bmd330eval/board.yml @@ -0,0 +1,5 @@ +board: + name: ubx_bmd330eval + vendor: U-blox + socs: + - name: nrf52810 diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.jpg b/boards/ublox/ubx_bmd330eval/doc/img/BMD-30-33-35-36-EVAL.jpg similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.jpg rename to boards/ublox/ubx_bmd330eval/doc/img/BMD-30-33-35-36-EVAL.jpg diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.jpg b/boards/ublox/ubx_bmd330eval/doc/img/bmd-300-eval_pin_out.jpg similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.jpg rename to boards/ublox/ubx_bmd330eval/doc/img/bmd-300-eval_pin_out.jpg diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/doc/index.rst b/boards/ublox/ubx_bmd330eval/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/doc/index.rst rename to boards/ublox/ubx_bmd330eval/doc/index.rst index 56ede10d98b..d23b576f8f5 100644 --- a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/doc/index.rst +++ b/boards/ublox/ubx_bmd330eval/doc/index.rst @@ -355,7 +355,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: ubx_bmd330eval_nrf52810 + :board: ubx_bmd330eval/nrf52810 :goals: build flash Debugging @@ -378,7 +378,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_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810.dts`. +can be found in :zephyr_file:`boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810.dts`. References ********** diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/pre_dt_board.cmake b/boards/ublox/ubx_bmd330eval/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/pre_dt_board.cmake rename to boards/ublox/ubx_bmd330eval/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810.yaml b/boards/ublox/ubx_bmd330eval/ubx_bmd330eval.yaml similarity index 88% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810.yaml rename to boards/ublox/ubx_bmd330eval/ubx_bmd330eval.yaml index 3554db7451f..50d337f1c35 100644 --- a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810.yaml +++ b/boards/ublox/ubx_bmd330eval/ubx_bmd330eval.yaml @@ -1,4 +1,4 @@ -identifier: ubx_bmd330eval_nrf52810 +identifier: ubx_bmd330eval/nrf52810 name: UBX_BMD330EVAL_NRF52810 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810-pinctrl.dtsi b/boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810-pinctrl.dtsi rename to boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810.dts b/boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810.dts similarity index 100% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810.dts rename to boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810.dts diff --git a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810_defconfig b/boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810_defconfig similarity index 79% rename from boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810_defconfig rename to boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810_defconfig index edfe56e0a15..7107ff3f634 100644 --- a/boards/boards_legacy/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810_defconfig +++ b/boards/ublox/ubx_bmd330eval/ubx_bmd330eval_nrf52810_defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52810_QFAA=y -CONFIG_BOARD_UBX_BMD330EVAL_NRF52810=y - # Enable MPU CONFIG_ARM_MPU=y