michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: nrf52810_pca10040: Rename to nrf52dk_nrf52810

Browse source 
The board target for emulation of nRF52810 on nRF5DK, so far
known as nrf52810_pca10040, is renamed to nrf52dk_nrf52810.
Its documentation and all references to its name in the tree are
updated accordingly. Overlay and configuration files specific to
this board are also renamed, to match the new board name.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2020-04-02 19:03:19 +02:00 • committed by Carles Cufí
commit 205cf1595e
20 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/nrf52810_pca10040/CMakeLists.txt → boards/arm/nrf52dk_nrf52810/CMakeLists.txt
View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# The nrf52810_pca10040 board mirrors the nRF52832 DK hardware. This # The nrf52dk_nrf52810 board mirrors the nRF52832 DK hardware. This
# needs to be considered by certain system initialization functionality # needs to be considered by certain system initialization functionality
# residing in system_nrf52810.c and SoC dependent routines in nrfx_coredep.h. # residing in system_nrf52810.c and SoC dependent routines in nrfx_coredep.h.
zephyr_compile_definitions(DEVELOP_IN_NRF52832) zephyr_compile_definitions(DEVELOP_IN_NRF52832)

6
boards/arm/nrf52810_pca10040/Kconfig → boards/arm/nrf52dk_nrf52810/Kconfig
View file

@ -1,9 +1,9 @@
# nRF52810 PCA10040 board configuration # nRF52 DK nRF52810 board configuration
# Copyright (c) 2018 Nordic Semiconductor ASA # Copyright (c) 2018 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if BOARD_NRF52810_PCA10040 if BOARD_NRF52DK_NRF52810
config BOARD_ENABLE_DCDC config BOARD_ENABLE_DCDC
bool "Enable DCDC mode" bool "Enable DCDC mode"
@ -15,4 +15,4 @@ config BOARD_ENABLE_DCDC
config BT_CTLR config BT_CTLR
default y if BT default y if BT
endif # BOARD_NRF52810_PCA10040 endif # BOARD_NRF52DK_NRF52810

6
boards/arm/nrf52810_pca10040/Kconfig.board → boards/arm/nrf52dk_nrf52810/Kconfig.board
View file

@ -1,8 +1,8 @@
# nRF52810 PCA10040 board configuration # nRF52 DK nRF52810 board configuration
# Copyright (c) 2018 Nordic Semiconductor ASA # Copyright (c) 2018 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config BOARD_NRF52810_PCA10040 config BOARD_NRF52DK_NRF52810
bool "nRF52810 PCA10040" bool "nRF52 DK NRF52810"
depends on SOC_NRF52810_QFAA depends on SOC_NRF52810_QFAA

8
boards/arm/nrf52810_pca10040/Kconfig.defconfig → boards/arm/nrf52dk_nrf52810/Kconfig.defconfig
View file

@ -1,15 +1,15 @@
# nRF52810 PCA10040 board configuration # nRF52 DK nRF52810 board configuration
# Copyright (c) 2018 Nordic Semiconductor ASA # Copyright (c) 2018 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if BOARD_NRF52810_PCA10040 if BOARD_NRF52DK_NRF52810
config BOARD config BOARD
default "nrf52810_pca10040" default "nrf52dk_nrf52810"
config ADC_0 config ADC_0
default y default y
depends on ADC depends on ADC
endif # BOARD_NRF52810_PCA10040 endif # BOARD_NRF52DK_NRF52810

0
boards/arm/nrf52810_pca10040/board.cmake → boards/arm/nrf52dk_nrf52810/board.cmake
View file

12
boards/arm/nrf52810_pca10040/doc/index.rst → boards/arm/nrf52dk_nrf52810/doc/index.rst
View file

@ -1,12 +1,12 @@
.. _nrf52810_pca10040: .. _nrf52dk_nrf52810:
nRF52810-PCA10040 nRF52810 emulation on nRF52 DK
################# ##############################
Overview Overview
******** ********
The nrf52810_pca10040 board is a modified version of the :ref:`nrf52dk_nrf52832` 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 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 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 development kit for the nRF52810 you can use this board to develop for this
@ -15,6 +15,10 @@ IC while using the nRF52 Development Kit (PCA10040).
See :ref:`nrf52dk_nrf52832` for more information about the development board and See :ref:`nrf52dk_nrf52832` for more information about the development board and
`nRF52810 website`_ for the official reference on the IC itself. `nRF52810 website`_ for the official reference on the IC itself.
.. note::
In previous Zephyr releases this board was named *nrf52810_pca10040*.
References References
********** **********

4
boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts → boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts
View file

@ -10,8 +10,8 @@
#include <nordic/nrf52810_qfaa.dtsi> #include <nordic/nrf52810_qfaa.dtsi>
/ { / {
model = "Nordic PCA10040 Dev Kit"; model = "Nordic nRF52 DK NRF52810";
compatible = "nordic,pca10040-dk", "nordic,nrf52810-qfaa", compatible = "nordic,nrf52-dk-nrf52810", "nordic,nrf52810-qfaa",
"nordic,nrf52810"; "nordic,nrf52810";
chosen { chosen {

4
boards/arm/nrf52810_pca10040/nrf52810_pca10040.yaml → boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.yaml
View file

@ -1,5 +1,5 @@
identifier: nrf52810_pca10040 identifier: nrf52dk_nrf52810
name: nRF52810-PCA10040 name: nRF52-DK-NRF52810
type: mcu type: mcu
arch: arm arch: arm
toolchain: toolchain:

2
boards/arm/nrf52810_pca10040/nrf52810_pca10040_defconfig → boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig
View file

@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52810_QFAA=y CONFIG_SOC_NRF52810_QFAA=y
CONFIG_BOARD_NRF52810_PCA10040=y CONFIG_BOARD_NRF52DK_NRF52810=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y

1
boards/deprecated.cmake
View file

@ -11,6 +11,7 @@
set(nrf51_pca10028_DEPRECATED nrf51dk_nrf51422) set(nrf51_pca10028_DEPRECATED nrf51dk_nrf51422)
set(nrf51_pca10031_DEPRECATED nrf51dongle_nrf51422) set(nrf51_pca10031_DEPRECATED nrf51dongle_nrf51422)
set(nrf52_pca10040_DEPRECATED nrf52dk_nrf52832) set(nrf52_pca10040_DEPRECATED nrf52dk_nrf52832)
set(nrf52810_pca10040_DEPRECATED nrf52dk_nrf52810)
set(nrf52840_pca10056_DEPRECATED nrf52840dk_nrf52840) set(nrf52840_pca10056_DEPRECATED nrf52840dk_nrf52840)
set(nrf52811_pca10056_DEPRECATED nrf52840dk_nrf52811) set(nrf52811_pca10056_DEPRECATED nrf52840dk_nrf52811)
set(nrf9160_pca10090_DEPRECATED nrf9160dk_nrf9160) set(nrf9160_pca10090_DEPRECATED nrf9160dk_nrf9160)

3
doc/conf.py
View file

@ -340,7 +340,8 @@ html_redirect_pages = [
('boards/arm/nrf51_pca10028/doc/nrf51_pca10028', 'boards/arm/nrf51dk_nrf51422/doc/index'), ('boards/arm/nrf51_pca10028/doc/nrf51_pca10028', 'boards/arm/nrf51dk_nrf51422/doc/index'),
('boards/arm/nrf51_pca10028/doc/nrf51_pca10028/index', 'boards/arm/nrf51dk_nrf51422/doc/index'), ('boards/arm/nrf51_pca10028/doc/nrf51_pca10028/index', 'boards/arm/nrf51dk_nrf51422/doc/index'),
('boards/arm/nrf51_vbluno51/doc/nrf51_vbluno51', 'boards/arm/nrf51_vbluno51/doc/index'), ('boards/arm/nrf51_vbluno51/doc/nrf51_vbluno51', 'boards/arm/nrf51_vbluno51/doc/index'),
('boards/arm/nrf52810_pca10040/doc/nrf52810_pca10040', 'boards/arm/nrf52810_pca10040/doc/index'), ('boards/arm/nrf52810_pca10040/doc/nrf52810_pca10040', 'boards/arm/nrf52dk_nrf52810/doc/index'),
('boards/arm/nrf52810_pca10040/doc/nrf52810_pca10040/index', 'boards/arm/nrf52dk_nrf52810/doc/index'),
('boards/arm/nrf52840_pca10056/doc/nrf52840_pca10056', 'boards/arm/nrf52840dk_nrf52840/doc/index'), ('boards/arm/nrf52840_pca10056/doc/nrf52840_pca10056', 'boards/arm/nrf52840dk_nrf52840/doc/index'),
('boards/arm/nrf52840_pca10056/doc/nrf52840_pca10056/index', 'boards/arm/nrf52840dk_nrf52840/doc/index'), ('boards/arm/nrf52840_pca10056/doc/nrf52840_pca10056/index', 'boards/arm/nrf52840dk_nrf52840/doc/index'),
('boards/arm/nrf9160_pca10090/doc/nrf9160_pca10090/index', 'boards/arm/nrf9160dk_nrf9160/doc/index'), ('boards/arm/nrf9160_pca10090/doc/nrf9160_pca10090/index', 'boards/arm/nrf9160dk_nrf9160/doc/index'),

2
subsys/bluetooth/controller/Kconfig
View file

@ -970,7 +970,7 @@ config BT_CTLR_PROFILE_ISR
config BT_CTLR_DEBUG_PINS config BT_CTLR_DEBUG_PINS
bool "Bluetooth Controller Debug Pins" bool "Bluetooth Controller Debug Pins"
depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52810_PCA10040 || BOARD_NRF52840DK_NRF52840 || BOARD_RV32M1_VEGA depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52DK_NRF52810 || BOARD_NRF52840DK_NRF52840 || BOARD_RV32M1_VEGA
help help
Turn on debug GPIO toggling for the BLE Controller. This is useful Turn on debug GPIO toggling for the BLE Controller. This is useful
when debugging with a logic analyzer or profiling certain sections of when debugging with a logic analyzer or profiling certain sections of

2
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h
View file

@ -19,7 +19,7 @@
#define DEBUG_PIN8 BIT(10) #define DEBUG_PIN8 BIT(10)
#define DEBUG_PIN9 BIT(11) #define DEBUG_PIN9 BIT(11)
#elif defined(CONFIG_BOARD_NRF52DK_NRF52832) || \ #elif defined(CONFIG_BOARD_NRF52DK_NRF52832) || \
defined(CONFIG_BOARD_NRF52810_PCA10040) defined(CONFIG_BOARD_NRF52DK_NRF52810)
#define DEBUG_PORT NRF_GPIO #define DEBUG_PORT NRF_GPIO
#define DEBUG_PIN0 BIT(11) #define DEBUG_PIN0 BIT(11)
#define DEBUG_PIN1 BIT(12) #define DEBUG_PIN1 BIT(12)

2
tests/bluetooth/mesh_shell/testcase.yaml
View file

@ -1,6 +1,6 @@
tests: tests:
bluetooth.mesh.mesh_shell: bluetooth.mesh.mesh_shell:
platform_whitelist: qemu_cortex_m3 qemu_x86 nrf51dk_nrf51422 platform_whitelist: qemu_cortex_m3 qemu_x86 nrf51dk_nrf51422
platform_exclude: nrf52810_pca10040 platform_exclude: nrf52dk_nrf52810
tags: bluetooth tags: bluetooth
harness: keyboard harness: keyboard

4
tests/bluetooth/shell/testcase.yaml
View file

@ -3,7 +3,7 @@ tests:
extra_configs: extra_configs:
- CONFIG_NATIVE_UART_0_ON_STDINOUT=y - CONFIG_NATIVE_UART_0_ON_STDINOUT=y
platform_whitelist: qemu_cortex_m3 qemu_x86 native_posix native_posix_64 nrf52840dk_nrf52840 platform_whitelist: qemu_cortex_m3 qemu_x86 native_posix native_posix_64 nrf52840dk_nrf52840
platform_exclude: nrf52810_pca10040 platform_exclude: nrf52dk_nrf52810
tags: bluetooth tags: bluetooth
harness: keyboard harness: keyboard
min_flash: 145 min_flash: 145
@ -12,7 +12,7 @@ tests:
- CONFIG_NATIVE_UART_0_ON_STDINOUT=y - CONFIG_NATIVE_UART_0_ON_STDINOUT=y
extra_args: CONF_FILE="prj_br.conf" extra_args: CONF_FILE="prj_br.conf"
platform_whitelist: qemu_cortex_m3 qemu_x86 native_posix native_posix_64 platform_whitelist: qemu_cortex_m3 qemu_x86 native_posix native_posix_64
platform_exclude: nrf52810_pca10040 platform_exclude: nrf52dk_nrf52810
tags: bluetooth tags: bluetooth
harness: keyboard harness: keyboard
bluetooth.shell.adv_ext: bluetooth.shell.adv_ext:

0
tests/drivers/counter/counter_basic_api/boards/nrf52810_pca10040.conf → tests/drivers/counter/counter_basic_api/boards/nrf52dk_nrf52810.conf
View file

0
tests/drivers/counter/counter_basic_api/boards/nrf52810_pca10040.overlay → tests/drivers/counter/counter_basic_api/boards/nrf52dk_nrf52810.overlay
View file

2
tests/kernel/poll/testcase.yaml
View file

@ -3,4 +3,4 @@ tests:
tags: kernel userspace tags: kernel userspace
min_ram: 16 min_ram: 16
min_flash: 34 min_flash: 34
platform_exclude: nrf52810_pca10040 platform_exclude: nrf52dk_nrf52810

2
tests/kernel/sched/metairq/testcase.yaml
View file

@ -2,4 +2,4 @@ tests:
kernel.scheduler.metairq: kernel.scheduler.metairq:
tags: kernel tags: kernel
filter: not CONFIG_SMP filter: not CONFIG_SMP
platform_exclude: nrf52810_pca10040 platform_exclude: nrf52dk_nrf52810

2
tests/kernel/sched/preempt/testcase.yaml
View file

@ -2,4 +2,4 @@ tests:
kernel.scheduler.preempt: kernel.scheduler.preempt:
tags: kernel tags: kernel
filter: not CONFIG_SMP filter: not CONFIG_SMP
platform_exclude: nrf52810_pca10040 platform_exclude: nrf52dk_nrf52810