Browse Source
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>pull/69687/head
Jamie McCrae
1 year ago
committed by
Carles Cufi
24 changed files with 53 additions and 102 deletions
@ -1,10 +0,0 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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") |
||||
@ -0,0 +1,6 @@
@@ -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 |
||||
@ -0,0 +1,8 @@
@@ -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 |
@ -1,4 +1,4 @@
@@ -1,4 +1,4 @@
|
||||
identifier: nrf52840dk_nrf52811 |
||||
identifier: nrf52840dk/nrf52811 |
||||
name: nRF52840-DK-NRF52811 |
||||
type: mcu |
||||
arch: arm |
||||
@ -1,4 +1,4 @@
@@ -1,4 +1,4 @@
|
||||
identifier: nrf52840dk_nrf52840 |
||||
identifier: nrf52840dk/nrf52840 |
||||
name: nRF52840-DK-NRF52840 |
||||
type: mcu |
||||
arch: arm |
||||
@ -1,9 +1,5 @@
@@ -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 |
||||
|
||||
Loading…
Reference in new issue