diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/CMakeLists.txt b/boards/boards_legacy/arm/nrf52dk_nrf52805/CMakeLists.txt deleted file mode 100644 index d708ea8ca21..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -# The nrf52dk_nrf52805 board mirrors the nRF52 DK hardware. This needs -# to be considered by certain system initialization functionality residing -# in system_nrf52805.c and SoC dependent routines in nrfx_coredep.h. -zephyr_compile_definitions(DEVELOP_IN_NRF52832) -zephyr_compile_definitions(NRFX_COREDEP_DELAY_US_LOOP_CYCLES=3) diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig b/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig deleted file mode 100644 index 89f210e7e37..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -# nRF52 DK nRF52805 board configuration - -# Copyright (c) 2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ENABLE_DCDC - bool "DCDC mode" - select SOC_DCDC_NRF52X - default y - depends on BOARD_NRF52DK_NRF52805 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.board b/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.board deleted file mode 100644 index cf5fede2872..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 DK nRF52805 board configuration - -# Copyright (c) 2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52DK_NRF52805 - bool "nRF52 DK NRF52805" - depends on SOC_NRF52805_CAAA diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.defconfig b/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.defconfig deleted file mode 100644 index 6fa1686219e..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# nRF52 DK nRF52805 board configuration - -# Copyright (c) 2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NRF52DK_NRF52805 - -config BOARD - default "nrf52dk_nrf52805" - -config BT_CTLR - default BT - -endif # BOARD_NRF52DK_NRF52805 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/board.cmake b/boards/boards_legacy/arm/nrf52dk_nrf52805/board.cmake deleted file mode 100644 index e3f77214027..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake) diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/doc/index.rst b/boards/boards_legacy/arm/nrf52dk_nrf52805/doc/index.rst deleted file mode 100644 index 121d1d508d0..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/doc/index.rst +++ /dev/null @@ -1,23 +0,0 @@ -.. _nrf52dk_nrf52805: - -nRF52805 emulation on nRF52 DK -############################## - -Overview -******** - -The nrf52dk_nrf52805 board is a modified version of the :ref:`nrf52dk_nrf52832` -that enforces the limitations imposed by the nRF52805 IC, which is a -cost-reduced variant of the original nRF52832. Since Nordic does not offer a -development kit for the nRF52805, you can use this board to develop for this -IC while using the nRF52 Development Kit (PCA10040). - -See :ref:`nrf52dk_nrf52832` for more information about the development board and -`nRF52805 website`_ for the official reference on the IC itself. - -References -********** - -.. target-notes:: - -.. _nRF52805 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52805 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/CMakeLists.txt b/boards/boards_legacy/arm/nrf52dk_nrf52810/CMakeLists.txt deleted file mode 100644 index a36a95351a1..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -# The nrf52dk_nrf52810 board mirrors the nRF52832 DK hardware. This -# needs to be considered by certain system initialization functionality -# residing in system_nrf52810.c and SoC dependent routines in nrfx_coredep.h. -zephyr_compile_definitions(DEVELOP_IN_NRF52832) -zephyr_compile_definitions(NRFX_COREDEP_DELAY_US_LOOP_CYCLES=3) diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.board b/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.board deleted file mode 100644 index 03004863b14..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 DK nRF52810 board configuration - -# Copyright (c) 2018 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52DK_NRF52810 - bool "nRF52 DK NRF52810" - depends on SOC_NRF52810_QFAA diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.defconfig b/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.defconfig deleted file mode 100644 index d98b71c5e61..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# nRF52 DK nRF52810 board configuration - -# Copyright (c) 2018 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NRF52DK_NRF52810 - -config BOARD - default "nrf52dk_nrf52810" - -endif # BOARD_NRF52DK_NRF52810 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/board.cmake b/boards/boards_legacy/arm/nrf52dk_nrf52810/board.cmake deleted file mode 100644 index e3f77214027..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake) diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/doc/index.rst b/boards/boards_legacy/arm/nrf52dk_nrf52810/doc/index.rst deleted file mode 100644 index 8a767ca1b5b..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/doc/index.rst +++ /dev/null @@ -1,24 +0,0 @@ -.. _nrf52dk_nrf52810: - -nRF52810 emulation on nRF52 DK -############################## - -Overview -******** - -The nrf52dk_nrf52810 board is a modified version of the :ref:`nrf52dk_nrf52832` -that enforces the limitations imposed by the nRF52810 IC, which is a -cost-reduced variant of the original nRF52832. Since Nordic does not offer a -development kit for the nRF52810 you can use this board to develop for this -IC while using the nRF52 Development Kit (PCA10040). - -See :ref:`nrf52dk_nrf52832` for more information about the development board and -`nRF52810 website`_ for the official reference on the IC itself. - - -References -********** - -.. target-notes:: - -.. _nRF52810 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52810 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/pre_dt_board.cmake b/boards/boards_legacy/arm/nrf52dk_nrf52810/pre_dt_board.cmake deleted file mode 100644 index 3369c21d3af..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/pre_dt_board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - power@40000000 & clock@40000000 & bprot@40000000 -# - acl@4001e000 & flash-controller@4001e000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig b/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig deleted file mode 100644 index 3ed080aa6d1..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -# nRF52 DK board configuration - -# Copyright (c) 2016 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ENABLE_DCDC - bool "DCDC mode" - select SOC_DCDC_NRF52X - default y - depends on BOARD_NRF52DK_NRF52832 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.board b/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.board deleted file mode 100644 index b853f2023b8..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 DK NRF52832 board configuration - -# Copyright (c) 2016 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52DK_NRF52832 - bool "nRF52 DK NRF52832" - depends on SOC_NRF52832_QFAA diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.defconfig b/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.defconfig deleted file mode 100644 index 648ea4de83d..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# nRF52 DK NRF52832 board configuration - -# Copyright (c) 2016 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NRF52DK_NRF52832 - -config BOARD - default "nrf52dk_nrf52832" - -config BT_CTLR - default BT - -endif # BOARD_NRF52DK_NRF52832 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/pre_dt_board.cmake b/boards/boards_legacy/arm/nrf52dk_nrf52832/pre_dt_board.cmake deleted file mode 100644 index 3369c21d3af..00000000000 --- a/boards/boards_legacy/arm/nrf52dk_nrf52832/pre_dt_board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - power@40000000 & clock@40000000 & bprot@40000000 -# - acl@4001e000 & flash-controller@4001e000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/nordic_nrf/nrf52dk/CMakeLists.txt b/boards/nordic_nrf/nrf52dk/CMakeLists.txt new file mode 100644 index 00000000000..9135ec34d6f --- /dev/null +++ b/boards/nordic_nrf/nrf52dk/CMakeLists.txt @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: Apache-2.0 + +if(CONFIG_BOARD_NRF52DK_NRF52805 OR CONFIG_BOARD_NRF52DK_NRF52810) + # The nrf52dk_nrf52805/nrf52dk_nrf52810 boards mirrors the nRF52832 DK hardware. This + # needs to be considered by certain system initialization functionality + # residing in system_nrf52810.c and SoC dependent routines in nrfx_coredep.h. + zephyr_compile_definitions(DEVELOP_IN_NRF52832) + zephyr_compile_definitions(NRFX_COREDEP_DELAY_US_LOOP_CYCLES=3) +endif() diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig b/boards/nordic_nrf/nrf52dk/Kconfig similarity index 85% rename from boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig rename to boards/nordic_nrf/nrf52dk/Kconfig index 4bb3d0a20cc..fb039240e01 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig +++ b/boards/nordic_nrf/nrf52dk/Kconfig @@ -3,7 +3,7 @@ # Copyright (c) 2018 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52DK_NRF52810 +if BOARD_NRF52DK config BOARD_ENABLE_DCDC bool "DCDC mode" @@ -15,4 +15,4 @@ config BOARD_ENABLE_DCDC config BT_CTLR default y if BT -endif # BOARD_NRF52DK_NRF52810 +endif # BOARD_NRF52DK diff --git a/boards/nordic_nrf/nrf52dk/Kconfig.nrf52dk b/boards/nordic_nrf/nrf52dk/Kconfig.nrf52dk new file mode 100644 index 00000000000..d04465a5135 --- /dev/null +++ b/boards/nordic_nrf/nrf52dk/Kconfig.nrf52dk @@ -0,0 +1,9 @@ +# nRF52 DK nRF52810 board configuration + +# Copyright (c) 2018 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52DK + select SOC_NRF52805_CAAA if BOARD_NRF52DK_NRF52805 + select SOC_NRF52810_QFAA if BOARD_NRF52DK_NRF52810 + select SOC_NRF52832_QFAA if BOARD_NRF52DK_NRF52832 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/board.cmake b/boards/nordic_nrf/nrf52dk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52832/board.cmake rename to boards/nordic_nrf/nrf52dk/board.cmake diff --git a/boards/nordic_nrf/nrf52dk/board.yml b/boards/nordic_nrf/nrf52dk/board.yml new file mode 100644 index 00000000000..8bd4aaaf82e --- /dev/null +++ b/boards/nordic_nrf/nrf52dk/board.yml @@ -0,0 +1,7 @@ +board: + name: nrf52dk + vendor: Nordic Semiconductor + socs: + - name: nrf52805 + - name: nrf52810 + - name: nrf52832 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg b/boards/nordic_nrf/nrf52dk/doc/img/nrf52dk_nrf52832.jpg similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg rename to boards/nordic_nrf/nrf52dk/doc/img/nrf52dk_nrf52832.jpg diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/doc/index.rst b/boards/nordic_nrf/nrf52dk/doc/index.rst similarity index 89% rename from boards/boards_legacy/arm/nrf52dk_nrf52832/doc/index.rst rename to boards/nordic_nrf/nrf52dk/doc/index.rst index 77bf7df995b..d15b6bb5e16 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52832/doc/index.rst +++ b/boards/nordic_nrf/nrf52dk/doc/index.rst @@ -372,7 +372,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf52dk_nrf52832 + :board: nrf52dk/nrf52832 :goals: build flash Debugging @@ -395,7 +395,7 @@ 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/nrf52dk_nrf52832/nrf52dk_nrf52832.dts`. +:zephyr_file:`boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.dts`. References ********** @@ -404,3 +404,52 @@ References .. _nRF52 DK website: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52-DK .. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com + +.. _nrf52dk_nrf52805: + +nRF52805 emulation on nRF52 DK +############################## + +Overview +******** + +The nrf52dk_nrf52805 board is a modified version of the :ref:`nrf52dk_nrf52832` +that enforces the limitations imposed by the nRF52805 IC, which is a +cost-reduced variant of the original nRF52832. Since Nordic does not offer a +development kit for the nRF52805, you can use this board to develop for this +IC while using the nRF52 Development Kit (PCA10040). + +See :ref:`nrf52dk_nrf52832` for more information about the development board and +`nRF52805 website`_ for the official reference on the IC itself. + +References +********** + +.. target-notes:: + +.. _nRF52805 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52805 + +.. _nrf52dk_nrf52810: + +nRF52810 emulation on nRF52 DK +############################## + +Overview +******** + +The nrf52dk_nrf52810 board is a modified version of the :ref:`nrf52dk_nrf52832` +that enforces the limitations imposed by the nRF52810 IC, which is a +cost-reduced variant of the original nRF52832. Since Nordic does not offer a +development kit for the nRF52810 you can use this board to develop for this +IC while using the nRF52 Development Kit (PCA10040). + +See :ref:`nrf52dk_nrf52832` for more information about the development board and +`nRF52810 website`_ for the official reference on the IC itself. + + +References +********** + +.. target-notes:: + +.. _nRF52810 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52810 diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805-pinctrl.dtsi b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805-pinctrl.dtsi rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.dts b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.dts similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.dts rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.dts diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.yaml b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.yaml similarity index 84% rename from boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.yaml rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.yaml index 3ebff8db1a4..86d3e44b8ef 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.yaml +++ b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.yaml @@ -1,4 +1,4 @@ -identifier: nrf52dk_nrf52805 +identifier: nrf52dk/nrf52805 name: nRF52-DK-NRF52805 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805_defconfig similarity index 81% rename from boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805_defconfig index d1c9da8186c..a4b09719b93 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig +++ b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52805_CAAA=y -CONFIG_BOARD_NRF52DK_NRF52805=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810-pinctrl.dtsi b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810-pinctrl.dtsi rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.dts similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.dts diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.yaml b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.yaml similarity index 84% rename from boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.yaml rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.yaml index 05e07eeba2a..46cc9adbac6 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.yaml +++ b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.yaml @@ -1,4 +1,4 @@ -identifier: nrf52dk_nrf52810 +identifier: nrf52dk/nrf52810 name: nRF52-DK-NRF52810 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810_defconfig similarity index 83% rename from boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810_defconfig index a90ea346ba0..a6749163af4 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig +++ b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52810_QFAA=y -CONFIG_BOARD_NRF52DK_NRF52810=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832-pinctrl.dtsi b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832-pinctrl.dtsi rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.dts similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.dts diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.yaml b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.yaml similarity index 89% rename from boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.yaml rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.yaml index 209069df379..f50bb91ba04 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.yaml +++ b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.yaml @@ -1,4 +1,4 @@ -identifier: nrf52dk_nrf52832 +identifier: nrf52dk/nrf52832 name: nRF52-DK-NRF52832 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832_defconfig similarity index 77% rename from boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig rename to boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832_defconfig index 1f1eccdbec2..8daa29dc473 100644 --- a/boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig +++ b/boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52DK_NRF52832=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nrf52dk_nrf52805/pre_dt_board.cmake b/boards/nordic_nrf/nrf52dk/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf52dk_nrf52805/pre_dt_board.cmake rename to boards/nordic_nrf/nrf52dk/pre_dt_board.cmake