boards: update nRF52840dk_nrf52840/nrf52811 board to board scheme v2.
This commit updates nrf52840dk_nrf52840 and nrf52840_nrf52811 to use board scheme v2, and thereby remove the Kconfig BOARD setting, as this is now passed from CMake. It combines both boards in a common nrf52840dk board folder where each SoC is an entry in the board.yml file. It also uses the new SoC approach, and thereby ensuring that the right SoC is always used, and cannot accidentially be changed by the user. Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
committed by
Carles Cufi
Carles Cufi
parent
c828dcc60e
commit
8c90fae8e0
@@ -1,10 +0,0 @@
|
||||
# nRF52840 DK NRF52811 board configuration
|
||||
|
||||
# Copyright (c) 2019 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_NRF52840DK_NRF52811
|
||||
@@ -1,8 +0,0 @@
|
||||
# nRF52840 DK NRF52811 board configuration
|
||||
|
||||
# Copyright (c) 2019 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
config BOARD_NRF52840DK_NRF52811
|
||||
bool "nRF52840 DK NRF52811"
|
||||
depends on SOC_NRF52811_QFAA
|
||||
@@ -1,14 +0,0 @@
|
||||
# nRF52840 DK NRF52811 board configuration
|
||||
|
||||
# Copyright (c) 2019 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
if BOARD_NRF52840DK_NRF52811
|
||||
|
||||
config BOARD
|
||||
default "nrf52840dk_nrf52811"
|
||||
|
||||
config BT_CTLR
|
||||
default BT
|
||||
|
||||
endif # BOARD_NRF52840DK_NRF52811
|
||||
@@ -1,9 +0,0 @@
|
||||
# Copyright (c) 2019 Nordic Semiconductor ASA
|
||||
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
board_runner_args(jlink "--device=nRF52840_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)
|
||||
@@ -1,24 +0,0 @@
|
||||
.. _nrf52840dk_nrf52811:
|
||||
|
||||
nRF52811 emulation on nRF52840 DK
|
||||
#################################
|
||||
|
||||
Overview
|
||||
********
|
||||
|
||||
The nrf52840dk_nrf52811 board is a modified version of the
|
||||
:ref:`nrf52840dk_nrf52840` that enforces the limitations imposed by the nRF52811
|
||||
IC, which is a variant of the original nRF52840. Since Nordic does not offer a
|
||||
development kit for the nRF52811 you can use this board to develop for this IC
|
||||
while using the nRF52840 Development Kit (PCA10056).
|
||||
|
||||
See :ref:`nrf52840dk_nrf52840` for more information about the development board
|
||||
and `nRF52811 website`_ for the official reference on the IC itself.
|
||||
|
||||
|
||||
References
|
||||
**********
|
||||
|
||||
.. target-notes::
|
||||
|
||||
.. _nRF52811 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52811
|
||||
@@ -1,8 +0,0 @@
|
||||
# nRF52840 DK NRF52840 board configuration
|
||||
|
||||
# Copyright (c) 2016 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
config BOARD_NRF52840DK_NRF52840
|
||||
bool "nRF52840 DK NRF52840"
|
||||
depends on SOC_NRF52840_QIAA
|
||||
@@ -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")
|
||||
@@ -5,5 +5,7 @@
|
||||
# The nrf52840dk_nrf52811 board mirrors the nRF52840 DK hardware. This
|
||||
# needs to be considered by certain system initialization functionality
|
||||
# residing in system_nrf52811.c and SoC dependent routines in nrfx_coredep.h.
|
||||
zephyr_compile_definitions(DEVELOP_IN_NRF52840)
|
||||
zephyr_compile_definitions(NRFX_COREDEP_DELAY_US_LOOP_CYCLES=3)
|
||||
if(CONFIG_BOARD_NRF52840DK_NRF52811)
|
||||
zephyr_compile_definitions(DEVELOP_IN_NRF52840)
|
||||
zephyr_compile_definitions(NRFX_COREDEP_DELAY_US_LOOP_CYCLES=3)
|
||||
endif()
|
||||
@@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2016 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
if BOARD_NRF52840DK_NRF52840
|
||||
if BOARD_NRF52840DK
|
||||
|
||||
config BOARD_ENABLE_DCDC
|
||||
bool "DCDC mode"
|
||||
@@ -14,5 +14,6 @@ config BOARD_ENABLE_DCDC_HV
|
||||
bool "High Voltage DCDC converter"
|
||||
select SOC_DCDC_NRF52X_HV
|
||||
default y
|
||||
depends on SOC_NRF52840_QIAA
|
||||
|
||||
endif # BOARD_NRF52840DK_NRF52840
|
||||
endif # BOARD_NRF52840DK
|
||||
@@ -3,12 +3,9 @@
|
||||
# Copyright (c) 2016 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
if BOARD_NRF52840DK_NRF52840
|
||||
|
||||
config BOARD
|
||||
default "nrf52840dk_nrf52840"
|
||||
if BOARD_NRF52840DK
|
||||
|
||||
config BT_CTLR
|
||||
default BT
|
||||
|
||||
endif # BOARD_NRF52840DK_NRF52840
|
||||
endif # BOARD_NRF52840DK
|
||||
6
boards/nordic_nrf/nrf52840dk/Kconfig.nrf52840dk
Normal file
6
boards/nordic_nrf/nrf52840dk/Kconfig.nrf52840dk
Normal file
@@ -0,0 +1,6 @@
|
||||
# Copyright (c) 2022 Zephyr Project members and individual contributors
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
config BOARD_NRF52840DK
|
||||
select SOC_NRF52840_QIAA if BOARD_NRF52840DK_NRF52840
|
||||
select SOC_NRF52811_QFAA if BOARD_NRF52840DK_NRF52811
|
||||
8
boards/nordic_nrf/nrf52840dk/board.yml
Normal file
8
boards/nordic_nrf/nrf52840dk/board.yml
Normal file
@@ -0,0 +1,8 @@
|
||||
board:
|
||||
name: nrf52840dk
|
||||
vendor: Nordic Semiconductor
|
||||
socs:
|
||||
# Physical nRF52840 SoC on PCA10056
|
||||
- name: nrf52840
|
||||
# nRF52840 SoC in nRF52811 emulation mode on PCA10056
|
||||
- name: nrf52811
|
||||
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
@@ -110,7 +110,7 @@ Push buttons
|
||||
Programming and Debugging
|
||||
*************************
|
||||
|
||||
Applications for the ``nrf52840dk_nrf52840`` board configuration can be
|
||||
Applications for the ``nrf52840dk/nrf52840`` board configuration can be
|
||||
built, flashed, and debugged in the usual way. See
|
||||
:ref:`build_an_application` and :ref:`application_run` for more details on
|
||||
building and running.
|
||||
@@ -139,7 +139,7 @@ Then build and flash the application in the usual way.
|
||||
|
||||
.. zephyr-app-commands::
|
||||
:zephyr-app: samples/hello_world
|
||||
:board: nrf52840dk_nrf52840
|
||||
:board: nrf52840dk/nrf52840
|
||||
:goals: build flash
|
||||
|
||||
Debugging
|
||||
@@ -162,7 +162,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/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts`.
|
||||
:zephyr_file:`boards/nordic_nrf/nrf52840dk/nrf52840dk_nrf52840.dts`.
|
||||
|
||||
Changing UART1 pins
|
||||
*******************
|
||||
@@ -213,6 +213,30 @@ In the table 7.1.1 'aQFN73 ball assignments' select the pins marked
|
||||
'General purpose I/O'. Note that pins marked as 'low frequency I/O only' can only be used
|
||||
in under-10KHz applications. They are not suitable for 115200 speed of UART.
|
||||
|
||||
.. _nrf52840dk_nrf52811:
|
||||
|
||||
nRF52811 emulation on nRF52840 DK
|
||||
#################################
|
||||
|
||||
Overview
|
||||
********
|
||||
|
||||
The nrf52840dk/nrf52811 board variant is a modified version of the
|
||||
:ref:`nrf52840dk/nrf52840` that enforces the limitations imposed by the nRF52811
|
||||
IC, which is a variant of the original nRF52840. Since Nordic does not offer a
|
||||
development kit for the nRF52811 you can use this board to develop for this IC
|
||||
while using the nRF52840 Development Kit (PCA10056).
|
||||
|
||||
See :ref:`nrf52840dk_nrf52840` for more information about the development board
|
||||
and `nRF52811 website`_ for the official reference on the IC itself.
|
||||
|
||||
|
||||
References
|
||||
**********
|
||||
|
||||
.. target-notes::
|
||||
|
||||
.. _nRF52811 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52811
|
||||
References
|
||||
**********
|
||||
|
||||
@@ -222,3 +246,4 @@ References
|
||||
.. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com
|
||||
.. _J-Link Software and documentation pack: https://www.segger.com/jlink-software.html
|
||||
.. _nRF52840 Product Specification: http://infocenter.nordicsemi.com/pdf/nRF52840_PS_v1.0.pdf
|
||||
.. _nRF52811 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52811
|
||||
@@ -1,4 +1,4 @@
|
||||
identifier: nrf52840dk_nrf52811
|
||||
identifier: nrf52840dk/nrf52811
|
||||
name: nRF52840-DK-NRF52811
|
||||
type: mcu
|
||||
arch: arm
|
||||
@@ -2,10 +2,6 @@
|
||||
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
CONFIG_SOC_SERIES_NRF52X=y
|
||||
CONFIG_SOC_NRF52811_QFAA=y
|
||||
CONFIG_BOARD_NRF52840DK_NRF52811=y
|
||||
|
||||
# Enable MPU
|
||||
CONFIG_ARM_MPU=y
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
identifier: nrf52840dk_nrf52840
|
||||
identifier: nrf52840dk/nrf52840
|
||||
name: nRF52840-DK-NRF52840
|
||||
type: mcu
|
||||
arch: arm
|
||||
@@ -1,9 +1,5 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
CONFIG_SOC_SERIES_NRF52X=y
|
||||
CONFIG_SOC_NRF52840_QIAA=y
|
||||
CONFIG_BOARD_NRF52840DK_NRF52840=y
|
||||
|
||||
# Enable MPU
|
||||
CONFIG_ARM_MPU=y
|
||||
|
||||
Reference in New Issue
Block a user