Browse Source

boards: arm: nrf52dk: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
pull/69687/head
Jamie McCrae 1 year ago committed by Carles Cufi
parent
commit
d2c7972a9a
  1. 7
      boards/boards_legacy/arm/nrf52dk_nrf52805/CMakeLists.txt
  2. 10
      boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig
  3. 8
      boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.board
  4. 14
      boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.defconfig
  5. 7
      boards/boards_legacy/arm/nrf52dk_nrf52805/board.cmake
  6. 23
      boards/boards_legacy/arm/nrf52dk_nrf52805/doc/index.rst
  7. 7
      boards/boards_legacy/arm/nrf52dk_nrf52810/CMakeLists.txt
  8. 8
      boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.board
  9. 11
      boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.defconfig
  10. 7
      boards/boards_legacy/arm/nrf52dk_nrf52810/board.cmake
  11. 24
      boards/boards_legacy/arm/nrf52dk_nrf52810/doc/index.rst
  12. 7
      boards/boards_legacy/arm/nrf52dk_nrf52810/pre_dt_board.cmake
  13. 10
      boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig
  14. 8
      boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.board
  15. 14
      boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.defconfig
  16. 7
      boards/boards_legacy/arm/nrf52dk_nrf52832/pre_dt_board.cmake
  17. 9
      boards/nordic_nrf/nrf52dk/CMakeLists.txt
  18. 4
      boards/nordic_nrf/nrf52dk/Kconfig
  19. 9
      boards/nordic_nrf/nrf52dk/Kconfig.nrf52dk
  20. 0
      boards/nordic_nrf/nrf52dk/board.cmake
  21. 7
      boards/nordic_nrf/nrf52dk/board.yml
  22. 0
      boards/nordic_nrf/nrf52dk/doc/img/nrf52dk_nrf52832.jpg
  23. 53
      boards/nordic_nrf/nrf52dk/doc/index.rst
  24. 0
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi
  25. 0
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.dts
  26. 2
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.yaml
  27. 4
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805_defconfig
  28. 0
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi
  29. 0
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.dts
  30. 2
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.yaml
  31. 4
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810_defconfig
  32. 0
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi
  33. 0
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.dts
  34. 2
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.yaml
  35. 4
      boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832_defconfig
  36. 0
      boards/nordic_nrf/nrf52dk/pre_dt_board.cmake

7
boards/boards_legacy/arm/nrf52dk_nrf52805/CMakeLists.txt

@ -1,7 +0,0 @@ @@ -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)

10
boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig

@ -1,10 +0,0 @@ @@ -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

8
boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.board

@ -1,8 +0,0 @@ @@ -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

14
boards/boards_legacy/arm/nrf52dk_nrf52805/Kconfig.defconfig

@ -1,14 +0,0 @@ @@ -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

7
boards/boards_legacy/arm/nrf52dk_nrf52805/board.cmake

@ -1,7 +0,0 @@ @@ -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)

23
boards/boards_legacy/arm/nrf52dk_nrf52805/doc/index.rst

@ -1,23 +0,0 @@ @@ -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

7
boards/boards_legacy/arm/nrf52dk_nrf52810/CMakeLists.txt

@ -1,7 +0,0 @@ @@ -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)

8
boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.board

@ -1,8 +0,0 @@ @@ -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

11
boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig.defconfig

@ -1,11 +0,0 @@ @@ -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

7
boards/boards_legacy/arm/nrf52dk_nrf52810/board.cmake

@ -1,7 +0,0 @@ @@ -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)

24
boards/boards_legacy/arm/nrf52dk_nrf52810/doc/index.rst

@ -1,24 +0,0 @@ @@ -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

7
boards/boards_legacy/arm/nrf52dk_nrf52810/pre_dt_board.cmake

@ -1,7 +0,0 @@ @@ -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")

10
boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig

@ -1,10 +0,0 @@ @@ -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

8
boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.board

@ -1,8 +0,0 @@ @@ -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

14
boards/boards_legacy/arm/nrf52dk_nrf52832/Kconfig.defconfig

@ -1,14 +0,0 @@ @@ -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

7
boards/boards_legacy/arm/nrf52dk_nrf52832/pre_dt_board.cmake

@ -1,7 +0,0 @@ @@ -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")

9
boards/nordic_nrf/nrf52dk/CMakeLists.txt

@ -0,0 +1,9 @@ @@ -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()

4
boards/boards_legacy/arm/nrf52dk_nrf52810/Kconfig → boards/nordic_nrf/nrf52dk/Kconfig

@ -3,7 +3,7 @@ @@ -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 @@ -15,4 +15,4 @@ config BOARD_ENABLE_DCDC
config BT_CTLR
default y if BT
endif # BOARD_NRF52DK_NRF52810
endif # BOARD_NRF52DK

9
boards/nordic_nrf/nrf52dk/Kconfig.nrf52dk

@ -0,0 +1,9 @@ @@ -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

0
boards/boards_legacy/arm/nrf52dk_nrf52832/board.cmake → boards/nordic_nrf/nrf52dk/board.cmake

7
boards/nordic_nrf/nrf52dk/board.yml

@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
board:
name: nrf52dk
vendor: Nordic Semiconductor
socs:
- name: nrf52805
- name: nrf52810
- name: nrf52832

0
boards/boards_legacy/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg → boards/nordic_nrf/nrf52dk/doc/img/nrf52dk_nrf52832.jpg

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

53
boards/boards_legacy/arm/nrf52dk_nrf52832/doc/index.rst → boards/nordic_nrf/nrf52dk/doc/index.rst

@ -372,7 +372,7 @@ Then build and flash the application in the usual way. @@ -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: @@ -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 @@ -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

0
boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805-pinctrl.dtsi → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi

0
boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.dts → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.dts

2
boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.yaml → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805.yaml

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
identifier: nrf52dk_nrf52805
identifier: nrf52dk/nrf52805
name: nRF52-DK-NRF52805
type: mcu
arch: arm

4
boards/boards_legacy/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52805_defconfig

@ -1,9 +1,5 @@ @@ -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

0
boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810-pinctrl.dtsi → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi

0
boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.dts

2
boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.yaml → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810.yaml

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
identifier: nrf52dk_nrf52810
identifier: nrf52dk/nrf52810
name: nRF52-DK-NRF52810
type: mcu
arch: arm

4
boards/boards_legacy/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52810_defconfig

@ -1,9 +1,5 @@ @@ -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

0
boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832-pinctrl.dtsi → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi

0
boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.dts

2
boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.yaml → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832.yaml

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
identifier: nrf52dk_nrf52832
identifier: nrf52dk/nrf52832
name: nRF52-DK-NRF52832
type: mcu
arch: arm

4
boards/boards_legacy/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig → boards/nordic_nrf/nrf52dk/nrf52dk_nrf52832_defconfig

@ -1,9 +1,5 @@ @@ -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

0
boards/boards_legacy/arm/nrf52dk_nrf52805/pre_dt_board.cmake → boards/nordic_nrf/nrf52dk/pre_dt_board.cmake

Loading…
Cancel
Save