boards: nrf52_pca10040: Rename to nrf52dk_nrf52832
The board name for the nRF52 DK, so far known as nrf52_pca10040, is
renamed to nrf52dk_nrf52832. 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>
diff --git a/boards/arm/nrf52810_pca10040/doc/index.rst b/boards/arm/nrf52810_pca10040/doc/index.rst
index a3fe576..170221f 100644
--- a/boards/arm/nrf52810_pca10040/doc/index.rst
+++ b/boards/arm/nrf52810_pca10040/doc/index.rst
@@ -6,13 +6,13 @@
Overview
********
-The nrf52810_pca10040 board is a modified version of the :ref:`nrf52_pca10040`
+The nrf52810_pca10040 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:`nrf52_pca10040` 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.
References
diff --git a/boards/arm/nrf52_pca10040/Kconfig.board b/boards/arm/nrf52_pca10040/Kconfig.board
deleted file mode 100644
index 210c656..0000000
--- a/boards/arm/nrf52_pca10040/Kconfig.board
+++ /dev/null
@@ -1,8 +0,0 @@
-# nRF52 PCA10040 board configuration
-
-# Copyright (c) 2016 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NRF52_PCA10040
- bool "nRF52 PCA10040"
- depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_pca20020/doc/index.rst b/boards/arm/nrf52_pca20020/doc/index.rst
index c794070..f7c8cf5 100644
--- a/boards/arm/nrf52_pca20020/doc/index.rst
+++ b/boards/arm/nrf52_pca20020/doc/index.rst
@@ -357,7 +357,7 @@
development boards, however, instructions from the :ref:`nordic_segger` page
also apply to this board, with the additional step of connecting an external
debugger. A development board with a Debug out connector such as the
-:ref:`nrf52_pca10040` can be used as a debugger with Thingy:52.
+:ref:`nrf52dk_nrf52832` can be used as a debugger with Thingy:52.
Testing board features
**********************
diff --git a/boards/arm/nrf52_pca10040/Kconfig b/boards/arm/nrf52dk_nrf52832/Kconfig
similarity index 70%
rename from boards/arm/nrf52_pca10040/Kconfig
rename to boards/arm/nrf52dk_nrf52832/Kconfig
index 5a63575..75d8e86 100644
--- a/boards/arm/nrf52_pca10040/Kconfig
+++ b/boards/arm/nrf52dk_nrf52832/Kconfig
@@ -1,4 +1,4 @@
-# nRF52 PCA10040 board configuration
+# nRF52 DK board configuration
# Copyright (c) 2016 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
@@ -7,4 +7,4 @@
bool "Enable DCDC mode"
select SOC_DCDC_NRF52X
default y
- depends on BOARD_NRF52_PCA10040
+ depends on BOARD_NRF52DK_NRF52832
diff --git a/boards/arm/nrf52dk_nrf52832/Kconfig.board b/boards/arm/nrf52dk_nrf52832/Kconfig.board
new file mode 100644
index 0000000..b853f20
--- /dev/null
+++ b/boards/arm/nrf52dk_nrf52832/Kconfig.board
@@ -0,0 +1,8 @@
+# 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/arm/nrf52_pca10040/Kconfig.defconfig b/boards/arm/nrf52dk_nrf52832/Kconfig.defconfig
similarity index 62%
rename from boards/arm/nrf52_pca10040/Kconfig.defconfig
rename to boards/arm/nrf52dk_nrf52832/Kconfig.defconfig
index 36ecb36..9363189 100644
--- a/boards/arm/nrf52_pca10040/Kconfig.defconfig
+++ b/boards/arm/nrf52dk_nrf52832/Kconfig.defconfig
@@ -1,12 +1,12 @@
-# nRF52 PCA10040 board configuration
+# nRF52 DK NRF52832 board configuration
# Copyright (c) 2016 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
-if BOARD_NRF52_PCA10040
+if BOARD_NRF52DK_NRF52832
config BOARD
- default "nrf52_pca10040"
+ default "nrf52dk_nrf52832"
config ADC_0
default y
@@ -19,4 +19,4 @@
config BT_CTLR
default BT
-endif # BOARD_NRF52_PCA10040
+endif # BOARD_NRF52DK_NRF52832
diff --git a/boards/arm/nrf52_pca10040/board.cmake b/boards/arm/nrf52dk_nrf52832/board.cmake
similarity index 100%
rename from boards/arm/nrf52_pca10040/board.cmake
rename to boards/arm/nrf52dk_nrf52832/board.cmake
diff --git a/boards/arm/nrf52_pca10040/doc/img/nrf52_pca10040.jpg b/boards/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg
similarity index 100%
rename from boards/arm/nrf52_pca10040/doc/img/nrf52_pca10040.jpg
rename to boards/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg
Binary files differ
diff --git a/boards/arm/nrf52_pca10040/doc/index.rst b/boards/arm/nrf52dk_nrf52832/doc/index.rst
similarity index 96%
rename from boards/arm/nrf52_pca10040/doc/index.rst
rename to boards/arm/nrf52dk_nrf52832/doc/index.rst
index 4e0f76c..ec2ba27 100644
--- a/boards/arm/nrf52_pca10040/doc/index.rst
+++ b/boards/arm/nrf52dk_nrf52832/doc/index.rst
@@ -1,7 +1,7 @@
-.. _nrf52_pca10040:
+.. _nrf52dk_nrf52832:
-nRF52-PCA10040
-##############
+nRF52 DK
+########
Overview
********
@@ -25,17 +25,21 @@
* :abbr:`UART (Universal asynchronous receiver-transmitter)`
* :abbr:`WDT (Watchdog Timer)`
-.. figure:: img/nrf52_pca10040.jpg
+.. figure:: img/nrf52dk_nrf52832.jpg
:width: 442px
:align: center
- :alt: nRF52 PCA10040 DK
+ :alt: nRF52 DK
- nRF52 PCA10040 DK (Credit: Nordic Semiconductor)
+ nRF52 DK (Credit: Nordic Semiconductor)
More information about the board can be found at the
`nRF52 DK website`_. The `Nordic Semiconductor Infocenter`_
contains the processor's information and the datasheet.
+.. note::
+
+ In previous Zephyr releases this board was named *nrf52_pca10040*.
+
Hardware
********
@@ -46,7 +50,7 @@
Supported Features
==================
-The nrf52_pca10040 board configuration supports the following
+The nrf52dk_nrf52832 board configuration supports the following
hardware features:
+-----------+------------+----------------------+
@@ -372,7 +376,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/hello_world
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build flash
Debugging
@@ -395,7 +399,7 @@
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/nrf52_pca10040/nrf52_pca10040.dts`.
+:zephyr_file:`boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts`.
References
**********
diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040.dts b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts
similarity index 97%
rename from boards/arm/nrf52_pca10040/nrf52_pca10040.dts
rename to boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts
index 69e056d..30ec575 100644
--- a/boards/arm/nrf52_pca10040/nrf52_pca10040.dts
+++ b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts
@@ -9,8 +9,8 @@
#include <nordic/nrf52832_qfaa.dtsi>
/ {
- model = "Nordic PCA10040 Dev Kit";
- compatible = "nordic,pca10040-dk", "nordic,nrf52832-qfaa",
+ model = "Nordic nRF52 DK NRF52832";
+ compatible = "nordic,nrf52-dk-nrf52832", "nordic,nrf52832-qfaa",
"nordic,nrf52832";
chosen {
diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040.yaml b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.yaml
similarity index 79%
rename from boards/arm/nrf52_pca10040/nrf52_pca10040.yaml
rename to boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.yaml
index 5422b92..be40a5b 100644
--- a/boards/arm/nrf52_pca10040/nrf52_pca10040.yaml
+++ b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.yaml
@@ -1,5 +1,5 @@
-identifier: nrf52_pca10040
-name: nRF52-PCA10040
+identifier: nrf52dk_nrf52832
+name: nRF52-DK-NRF52832
type: mcu
arch: arm
toolchain:
diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig
similarity index 90%
rename from boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
rename to boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig
index 2886035..4d6bbee 100644
--- a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
+++ b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig
@@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52832_QFAA=y
-CONFIG_BOARD_NRF52_PCA10040=y
+CONFIG_BOARD_NRF52DK_NRF52832=y
# Enable MPU
CONFIG_ARM_MPU=y
diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
index 9327111..339c2d2 100644
--- a/boards/deprecated.cmake
+++ b/boards/deprecated.cmake
@@ -10,6 +10,7 @@
set(nrf51_pca10028_DEPRECATED nrf51dk_nrf51422)
set(nrf51_pca10031_DEPRECATED nrf51dongle_nrf51422)
+set(nrf52_pca10040_DEPRECATED nrf52dk_nrf52832)
set(nrf52840_pca10056_DEPRECATED nrf52840dk_nrf52840)
set(nrf52811_pca10056_DEPRECATED nrf52840dk_nrf52811)
set(nrf9160_pca10090_DEPRECATED nrf9160dk_nrf9160)
diff --git a/boards/shields/dfrobot_can_bus_v2_0/boards/nrf52_pca10040.defconfig b/boards/shields/dfrobot_can_bus_v2_0/boards/nrf52dk_nrf52832.defconfig
similarity index 73%
rename from boards/shields/dfrobot_can_bus_v2_0/boards/nrf52_pca10040.defconfig
rename to boards/shields/dfrobot_can_bus_v2_0/boards/nrf52dk_nrf52832.defconfig
index c8d838a..384bf20 100644
--- a/boards/shields/dfrobot_can_bus_v2_0/boards/nrf52_pca10040.defconfig
+++ b/boards/shields/dfrobot_can_bus_v2_0/boards/nrf52dk_nrf52832.defconfig
@@ -3,4 +3,4 @@
config CAN_1
default y
- depends on BOARD_NRF52_PCA10040
+ depends on BOARD_NRF52DK_NRF52832
diff --git a/boards/shields/dfrobot_can_bus_v2_0/doc/index.rst b/boards/shields/dfrobot_can_bus_v2_0/doc/index.rst
index ef1c8a9..e37ab6b 100644
--- a/boards/shields/dfrobot_can_bus_v2_0/doc/index.rst
+++ b/boards/shields/dfrobot_can_bus_v2_0/doc/index.rst
@@ -120,7 +120,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/drivers/CAN
:tool: all
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:shield: dfrobot_can_bus_v2_0
:conf: prj.mcp2515.conf
:goals: build flash
diff --git a/cmake/extensions.cmake b/cmake/extensions.cmake
index b890da8..46f28b8 100644
--- a/cmake/extensions.cmake
+++ b/cmake/extensions.cmake
@@ -1442,7 +1442,7 @@
# Usage:
# print(BOARD)
#
-# will print: "BOARD: nrf52_pca10040"
+# will print: "BOARD: nrf52dk_nrf52832"
function(print arg)
message(STATUS "${arg}: ${${arg}}")
endfunction()
diff --git a/doc/conf.py b/doc/conf.py
index cc01d73..7d26f22 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -348,7 +348,8 @@
('boards/arm/nrf52840_pca10059/doc/nrf52840_pca10059', 'boards/arm/nrf52840_pca10059/doc/index'),
('boards/arm/nrf52_adafruit_feather/doc/nrf52_adafruit_feather', 'boards/arm/nrf52_adafruit_feather/doc/index'),
('boards/arm/nrf52_blenano2/doc/nrf52_blenano2', 'boards/arm/nrf52_blenano2/doc/index'),
- ('boards/arm/nrf52_pca10040/doc/nrf52_pca10040', 'boards/arm/nrf52_pca10040/doc/index'),
+ ('boards/arm/nrf52_pca10040/doc/nrf52_pca10040', 'boards/arm/nrf52dk_nrf52832/doc/index'),
+ ('boards/arm/nrf52_pca10040/doc/nrf52_pca10040/index', 'boards/arm/nrf52dk_nrf52832/doc/index'),
('boards/arm/nrf52_pca20020/doc/nrf52_pca20020', 'boards/arm/nrf52_pca20020/doc/index'),
('boards/arm/nrf52_vbluno52/doc/nrf52_vbluno52', 'boards/arm/nrf52_vbluno52/doc/index'),
('boards/arm/nucleo_f030r8/doc/nucleof030r8', 'boards/arm/nucleo_f030r8/doc/index'),
diff --git a/doc/guides/porting/board_porting.rst b/doc/guides/porting/board_porting.rst
index 365eca4..5932024 100644
--- a/doc/guides/porting/board_porting.rst
+++ b/doc/guides/porting/board_porting.rst
@@ -43,7 +43,7 @@
- SoC family
- CPU core
- Architecture
- * - :ref:`nrf52_pca10040 <nrf52_pca10040>`
+ * - :ref:`nrf52dk_nrf52832 <nrf52dk_nrf52832>`
- nRF52832
- nRF52
- Nordic nRF5
diff --git a/doc/guides/tools/nordic_segger.rst b/doc/guides/tools/nordic_segger.rst
index 5e341dd..918d005 100644
--- a/doc/guides/tools/nordic_segger.rst
+++ b/doc/guides/tools/nordic_segger.rst
@@ -63,7 +63,7 @@
nrfjprog --program outdir/<board>/zephyr.hex -f nrf5<x>
-Where: ``<board>`` is the board name you used in the BOARD directive when building (for example nrf52_pca10040)
+Where: ``<board>`` is the board name you used in the BOARD directive when building (for example nrf52dk_nrf52832)
and ``<x>`` is either 1 for nRF51-based boards or 2 for nRF52-based boards
* Reset and start Zephyr:
diff --git a/samples/application_development/out_of_tree_board/sample.yaml b/samples/application_development/out_of_tree_board/sample.yaml
index 802d851..1cf2d6b 100644
--- a/samples/application_development/out_of_tree_board/sample.yaml
+++ b/samples/application_development/out_of_tree_board/sample.yaml
@@ -4,7 +4,7 @@
tests:
sample.app_dev.out_of_tree:
tags: out_of_tree
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
harness: console
harness_config:
type: one_line
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index d3f2031..177989b 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -3,5 +3,5 @@
tests:
sample.bluetooth.beacon:
harness: bluetooth
- platform_whitelist: qemu_cortex_m3 qemu_x86 nrf52_pca10040
+ platform_whitelist: qemu_cortex_m3 qemu_x86 nrf52dk_nrf52832
tags: bluetooth
diff --git a/samples/bluetooth/hci_pwr_ctrl/sample.yaml b/samples/bluetooth/hci_pwr_ctrl/sample.yaml
index 9beceee..e82dbab 100644
--- a/samples/bluetooth/hci_pwr_ctrl/sample.yaml
+++ b/samples/bluetooth/hci_pwr_ctrl/sample.yaml
@@ -3,5 +3,5 @@
tests:
sample.bluetooth.hci_pwr_ctrl:
harness: bluetooth
- platform_whitelist: bbc_microbit nrf51dk_nrf51422 nrf52_pca10040 qemu_cortex_m3 qemu_x86
+ platform_whitelist: bbc_microbit nrf51dk_nrf51422 nrf52dk_nrf52832 qemu_cortex_m3 qemu_x86
tags: bluetooth
diff --git a/samples/bluetooth/hci_uart/README.rst b/samples/bluetooth/hci_uart/README.rst
index 9359b8f..71b6e9c 100644
--- a/samples/bluetooth/hci_uart/README.rst
+++ b/samples/bluetooth/hci_uart/README.rst
@@ -50,7 +50,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/bluetooth/hci_uart
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build flash
.. _bluetooth-hci-uart-qemu-posix:
diff --git a/samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf b/samples/bluetooth/hci_uart/boards/nrf52dk_nrf52832.conf
similarity index 100%
rename from samples/bluetooth/hci_uart/boards/nrf52_pca10040.conf
rename to samples/bluetooth/hci_uart/boards/nrf52dk_nrf52832.conf
diff --git a/samples/bluetooth/hci_uart/boards/nrf52_pca10040.overlay b/samples/bluetooth/hci_uart/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/bluetooth/hci_uart/boards/nrf52_pca10040.overlay
rename to samples/bluetooth/hci_uart/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index 22d824d..eb4b98b 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -5,10 +5,10 @@
sample.bluetooth.hci_uart.arm:
harness: bluetooth
platform_whitelist: 96b_nitrogen nrf51dk_nrf51422
- nrf52_pca10040 bbc_microbit
+ nrf52dk_nrf52832 bbc_microbit
tags: uart bluetooth
sample.bluetooth.hci_uart.nrf5:
harness: bluetooth
platform_whitelist: 96b_nitrogen nrf51dk_nrf51422
- nrf52_pca10040
+ nrf52dk_nrf52832
tags: uart bluetooth
diff --git a/samples/boards/nrf/mesh/onoff-app/README.rst b/samples/boards/nrf/mesh/onoff-app/README.rst
index a219cfa..e8cadcc 100644
--- a/samples/boards/nrf/mesh/onoff-app/README.rst
+++ b/samples/boards/nrf/mesh/onoff-app/README.rst
@@ -38,7 +38,7 @@
************
This sample has been tested on the Nordic nRF52840-PDK board, but would
-likely also run on the nrf52_pca10040 board.
+likely also run on the nrf52dk_nrf52832 board.
Building and Running
********************
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README.rst b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README.rst
index 64d323e..8cfb1fe 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README.rst
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README.rst
@@ -56,7 +56,7 @@
Requirements
************
This sample has been tested on the Nordic nRF52840-PDK board, but would
-likely also run on the nrf52_pca10040 board.
+likely also run on the nrf52dk_nrf52832 board.
Building and Running
********************
diff --git a/samples/boards/nrf/system_off/README.rst b/samples/boards/nrf/system_off/README.rst
index 0cb6bcc..bf8f47f 100644
--- a/samples/boards/nrf/system_off/README.rst
+++ b/samples/boards/nrf/system_off/README.rst
@@ -27,7 +27,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/boards/nrf52/system_off
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build flash
:compact:
@@ -50,7 +50,7 @@
***** Booting Zephyr OS build v2.1.0-rc1-158-gb642e1a96d17 *****
- nrf52_pca10040 system off demo
+ nrf52dk_nrf52832 system off demo
Busy-wait 2 s
Sleep 2 s
Sleep 60000 ms (deep sleep minimum)
diff --git a/samples/boards/nrf/system_off/sample.yaml b/samples/boards/nrf/system_off/sample.yaml
index 697c11f..5f78279 100644
--- a/samples/boards/nrf/system_off/sample.yaml
+++ b/samples/boards/nrf/system_off/sample.yaml
@@ -3,5 +3,5 @@
tests:
sample.boards.nrf.system_off:
build_only: true
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf51dk_nrf51422
tags: power
diff --git a/samples/drivers/CAN/README.rst b/samples/drivers/CAN/README.rst
index bda51f2..5d38adf 100644
--- a/samples/drivers/CAN/README.rst
+++ b/samples/drivers/CAN/README.rst
@@ -36,12 +36,12 @@
Stand alone CAN controller
==========================
-For the nRF52_PCA10040 board combined with the DFRobot CAN bus V2.0 shield that
+For the nrf52dk_nrf52832 board combined with the DFRobot CAN bus V2.0 shield that
provides the MCP2515 CAN controller:
.. zephyr-app-commands::
:zephyr-app: samples/drivers/CAN
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:shield: dfrobot_can_bus_v2_0
:conf: prj.mcp2515.conf
:goals: build flash
diff --git a/samples/drivers/counter/alarm/sample.yaml b/samples/drivers/counter/alarm/sample.yaml
index 018cb26..67b93fd 100644
--- a/samples/drivers/counter/alarm/sample.yaml
+++ b/samples/drivers/counter/alarm/sample.yaml
@@ -4,7 +4,7 @@
sample.drivers.counter.alarm:
tags: drivers
harness: console
- platform_whitelist: nucleo_f746zg nrf51dk_nrf51422 nrf52_pca10040
+ platform_whitelist: nucleo_f746zg nrf51dk_nrf51422 nrf52dk_nrf52832
nrf52840dk_nrf52840 nrf9160dk_nrf9160
harness_config:
type: multi_line
diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml
index 128a6bc..8cb4703 100644
--- a/samples/drivers/display/sample.yaml
+++ b/samples/drivers/display/sample.yaml
@@ -18,11 +18,11 @@
platform_whitelist: nrf52840dk_nrf52840
extra_args: SHIELD=waveshare_epaper_gdeh0213b1
sample.display.st7789v_tl019fqv01:
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
extra_args: SHIELD=st7789v_tl019fqv01
tags: display shield
sample.display.st7789v_waveshare_240x240:
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
extra_args: SHIELD=st7789v_waveshare_240x240
tags: display shield
sample.display.mcux_elcdif:
diff --git a/samples/drivers/led_ws2812/README.rst b/samples/drivers/led_ws2812/README.rst
index 1265aee..ff334a1 100644
--- a/samples/drivers/led_ws2812/README.rst
+++ b/samples/drivers/led_ws2812/README.rst
@@ -54,7 +54,7 @@
chain length (number of WS2812 chips).
For example devicetree configurations for each compatible, see
-:zephyr_file:`samples/drivers/led_ws2812/boards/nrf52_pca10040.overlay` and
+:zephyr_file:`samples/drivers/led_ws2812/boards/nrf52dk_nrf52832.overlay` and
:zephyr_file:`samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay`.
Some boards are already supported out of the box; see the :file:`boards`
diff --git a/samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay b/samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay
index c0597a6..c540ea3 100644
--- a/samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay
+++ b/samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay
@@ -14,7 +14,7 @@
chain-length = <16>; /* arbitrary */
/*
* Arduino D11 / P0.25, which was chosen to match the pin
- * used in nrf52_pca10040.overlay.
+ * used in nrf52dk_nrf52832.overlay.
*/
in-gpios = <&gpio0 25 0>;
};
diff --git a/samples/drivers/led_ws2812/boards/nrf52_pca10040.overlay b/samples/drivers/led_ws2812/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/drivers/led_ws2812/boards/nrf52_pca10040.overlay
rename to samples/drivers/led_ws2812/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/drivers/led_ws2812/sample.yaml b/samples/drivers/led_ws2812/sample.yaml
index 08e3ea8..ca1fbbb 100644
--- a/samples/drivers/led_ws2812/sample.yaml
+++ b/samples/drivers/led_ws2812/sample.yaml
@@ -3,5 +3,5 @@
name: WS2812 sample
tests:
sample.drivers.led.ws2812:
- platform_whitelist: bbc_microbit nrf51dk_nrf51422 nrf52_pca10040
+ platform_whitelist: bbc_microbit nrf51dk_nrf51422 nrf52dk_nrf52832
tags: LED
diff --git a/samples/drivers/soc_flash_nrf/sample.yaml b/samples/drivers/soc_flash_nrf/sample.yaml
index 4179d6f..8dbaf8f 100644
--- a/samples/drivers/soc_flash_nrf/sample.yaml
+++ b/samples/drivers/soc_flash_nrf/sample.yaml
@@ -2,7 +2,7 @@
name: SoC Flash on NRF52
tests:
sample.drivers.flash.soc_flash_nrf:
- platform_whitelist: nrf52_pca10040 nrf9160dk_nrf9160 nrf9160dk_nrf9160ns
+ platform_whitelist: nrf52dk_nrf52832 nrf9160dk_nrf9160 nrf9160dk_nrf9160ns
tags: flash nrf52 nrf9160
harness: console
harness_config:
diff --git a/samples/net/lwm2m_client/sample.yaml b/samples/net/lwm2m_client/sample.yaml
index 298c2b7..4938ddd 100644
--- a/samples/net/lwm2m_client/sample.yaml
+++ b/samples/net/lwm2m_client/sample.yaml
@@ -16,7 +16,7 @@
sample.net.lwm2m_client.bt:
harness: net
extra_args: OVERLAY_CONFIG=overlay-bt.conf
- platform_whitelist: nrf52_pca10040 nrf52840dk_nrf52840 disco_l475_iot1
+ platform_whitelist: nrf52dk_nrf52832 nrf52840dk_nrf52840 disco_l475_iot1
tags: net lwm2m
sample.net.lwm2m_client.queue_mode:
harness: net
diff --git a/samples/sensor/adt7420/README.rst b/samples/sensor/adt7420/README.rst
index b68be2a..f1620ef 100644
--- a/samples/sensor/adt7420/README.rst
+++ b/samples/sensor/adt7420/README.rst
@@ -36,12 +36,12 @@
This project outputs sensor data to the console. It requires an ADT7420
sensor. It should work with any platform featuring a I2C peripheral interface.
It does not work on QEMU.
-In this example below the :ref:`nrf52_pca10040` board is used.
+In this example below the :ref:`nrf52dk_nrf52832` board is used.
.. zephyr-app-commands::
:zephyr-app: samples/sensor/adt7420
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build flash
Sample Output
diff --git a/samples/sensor/adt7420/boards/nrf52_pca10040.overlay b/samples/sensor/adt7420/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/adt7420/boards/nrf52_pca10040.overlay
rename to samples/sensor/adt7420/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/adxl362/boards/nrf52_pca10040.overlay b/samples/sensor/adxl362/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/adxl362/boards/nrf52_pca10040.overlay
rename to samples/sensor/adxl362/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/adxl372/README.rst b/samples/sensor/adxl372/README.rst
index 3de21a8..f3fe8f3 100644
--- a/samples/sensor/adxl372/README.rst
+++ b/samples/sensor/adxl372/README.rst
@@ -66,12 +66,12 @@
This project outputs sensor data to the console. It requires an ADXL372
sensor. It should work with any platform featuring a I2C/SPI peripheral interface.
It does not work on QEMU.
-In this example below the :ref:`nrf52_pca10040` board is used.
+In this example below the :ref:`nrf52dk_nrf52832` board is used.
.. zephyr-app-commands::
:zephyr-app: samples/sensor/adxl372
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build flash
diff --git a/samples/sensor/adxl372/boards/nrf52_pca10040.overlay b/samples/sensor/adxl372/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/adxl372/boards/nrf52_pca10040.overlay
rename to samples/sensor/adxl372/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/adxl372/sample.yaml b/samples/sensor/adxl372/sample.yaml
index 65154f9..a2cd708 100644
--- a/samples/sensor/adxl372/sample.yaml
+++ b/samples/sensor/adxl372/sample.yaml
@@ -5,7 +5,7 @@
harness: sensor
tags: sensors
depends_on: spi
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
sample.sensor.adxl372.i2c:
harness: sensor
tags: sensors
diff --git a/samples/sensor/dht/README.rst b/samples/sensor/dht/README.rst
index ed2e996..20fc327 100644
--- a/samples/sensor/dht/README.rst
+++ b/samples/sensor/dht/README.rst
@@ -24,7 +24,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/sensor/dht
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build flash
Sample Output
diff --git a/samples/sensor/dht/boards/nrf52_pca10040.overlay b/samples/sensor/dht/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/dht/boards/nrf52_pca10040.overlay
rename to samples/sensor/dht/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/dht/sample.yaml b/samples/sensor/dht/sample.yaml
index 953d2233..3885989 100644
--- a/samples/sensor/dht/sample.yaml
+++ b/samples/sensor/dht/sample.yaml
@@ -9,5 +9,5 @@
tests:
sample.sensor.dht:
build_only: true
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
tags: sensors
diff --git a/samples/sensor/grove_light/boards/nrf52_pca10040.overlay b/samples/sensor/grove_light/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/grove_light/boards/nrf52_pca10040.overlay
rename to samples/sensor/grove_light/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/grove_light/sample.yaml b/samples/sensor/grove_light/sample.yaml
index 7576190..5f63509 100644
--- a/samples/sensor/grove_light/sample.yaml
+++ b/samples/sensor/grove_light/sample.yaml
@@ -3,6 +3,6 @@
tests:
sample.sensor.grove_light:
tags: drivers sensor grove light
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
harness: grove
depends_on: adc
diff --git a/samples/sensor/grove_temperature/boards/nrf52_pca10040.overlay b/samples/sensor/grove_temperature/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/grove_temperature/boards/nrf52_pca10040.overlay
rename to samples/sensor/grove_temperature/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/grove_temperature/sample.yaml b/samples/sensor/grove_temperature/sample.yaml
index d22b59a..63ac779 100644
--- a/samples/sensor/grove_temperature/sample.yaml
+++ b/samples/sensor/grove_temperature/sample.yaml
@@ -4,6 +4,6 @@
sample.sensor.grove_temperature:
min_flash: 33
tags: drivers sensor grove temperature
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
harness: grove
depends_on: adc
diff --git a/samples/sensor/isl29035/README.rst b/samples/sensor/isl29035/README.rst
index 5f362e2..10acaef 100644
--- a/samples/sensor/isl29035/README.rst
+++ b/samples/sensor/isl29035/README.rst
@@ -27,7 +27,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/sensor/isl29035
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build
:compact:
diff --git a/samples/sensor/isl29035/boards/nrf52_pca10040.overlay b/samples/sensor/isl29035/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/isl29035/boards/nrf52_pca10040.overlay
rename to samples/sensor/isl29035/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/isl29035/sample.yaml b/samples/sensor/isl29035/sample.yaml
index 6e6556e..1da9782 100644
--- a/samples/sensor/isl29035/sample.yaml
+++ b/samples/sensor/isl29035/sample.yaml
@@ -5,4 +5,4 @@
harness: console
tags: sensors
depends_on: i2c
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
diff --git a/samples/sensor/lps22hh/README.rst b/samples/sensor/lps22hh/README.rst
index ef249c9..545a6a5 100644
--- a/samples/sensor/lps22hh/README.rst
+++ b/samples/sensor/lps22hh/README.rst
@@ -27,7 +27,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/sensor/lps22hh
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:shield: x_nucleo_iks01a3
:goals: build
:compact:
diff --git a/samples/sensor/lps22hh/sample.yaml b/samples/sensor/lps22hh/sample.yaml
index 4af37e3..5d85249 100644
--- a/samples/sensor/lps22hh/sample.yaml
+++ b/samples/sensor/lps22hh/sample.yaml
@@ -3,7 +3,7 @@
tests:
sample.sensor.lps22hh.nrf52.iks01a3:
harness: console
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
tags: sensors
depends_on: i2c
extra_args: SHIELD=x_nucleo_iks01a3
diff --git a/samples/sensor/mpu6050/README.rst b/samples/sensor/mpu6050/README.rst
index 5a32538..793323f 100644
--- a/samples/sensor/mpu6050/README.rst
+++ b/samples/sensor/mpu6050/README.rst
@@ -28,7 +28,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/sensor/mpu6050
- :board: nrf52_pca10040
+ :board: nrf52dk_nrf52832
:goals: build flash
Sample Output
diff --git a/samples/sensor/mpu6050/boards/nrf52_pca10040.overlay b/samples/sensor/mpu6050/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from samples/sensor/mpu6050/boards/nrf52_pca10040.overlay
rename to samples/sensor/mpu6050/boards/nrf52dk_nrf52832.overlay
diff --git a/samples/sensor/mpu6050/sample.yaml b/samples/sensor/mpu6050/sample.yaml
index f09b664..55f8c60 100644
--- a/samples/sensor/mpu6050/sample.yaml
+++ b/samples/sensor/mpu6050/sample.yaml
@@ -9,5 +9,5 @@
tests:
sample.sensor.mpu6050:
build_only: true
- platform_whitelist: nrf52_pca10040
+ platform_whitelist: nrf52dk_nrf52832
tags: sensors
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
index fefcb52..f6c1721 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
@@ -52,7 +52,7 @@
The below steps describe how to build and run the ``smp_svr`` sample in
Zephyr. Where examples are given, they assume the sample is being built for
-the Nordic nRF52 Development Kit (``BOARD=nrf52_pca10040``).
+the Nordic nRF52 Development Kit (``BOARD=nrf52dk_nrf52832``).
If you would like to use a more constrained platform, such as the nRF51 DK, you
should use the :file:`prj_tiny.conf` configuration file rather than the default
@@ -91,8 +91,8 @@
.. zephyr-app-commands::
:zephyr-app: samples/subsys/mgmt/mcumgr/smp_svr
- :board: nrf52_pca10040
- :build-dir: nrf52_pca10040
+ :board: nrf52dk_nrf52832
+ :build-dir: nrf52dk_nrf52832
:goals: build
.. _smp_svr_sample_sign:
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 8df3790..fc07f94 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -9,4 +9,4 @@
extra_args: CONF_FILE="prj_tiny.conf"
platform_whitelist: nrf51dk_nrf51422
sample.mcumg.smp_svr.nrf52:
- platform_whitelist: nrf52_pca10040 nrf52840dk_nrf52840
+ platform_whitelist: nrf52dk_nrf52832 nrf52840dk_nrf52840
diff --git a/samples/subsys/power/device_pm/sample.yaml b/samples/subsys/power/device_pm/sample.yaml
index e11a31b..0ff9252 100644
--- a/samples/subsys/power/device_pm/sample.yaml
+++ b/samples/subsys/power/device_pm/sample.yaml
@@ -2,7 +2,7 @@
name: Device Idle Power Management
tests:
sample.power.ospm.dev_idle_pm:
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
tags: power
harness: console
harness_config:
diff --git a/samples/subsys/settings/boards/nrf52_pca10040.conf b/samples/subsys/settings/boards/nrf52dk_nrf52832.conf
similarity index 100%
rename from samples/subsys/settings/boards/nrf52_pca10040.conf
rename to samples/subsys/settings/boards/nrf52dk_nrf52832.conf
diff --git a/samples/subsys/shell/fs/CMakeLists.txt b/samples/subsys/shell/fs/CMakeLists.txt
index ed9c1b6..0172f57 100644
--- a/samples/subsys/shell/fs/CMakeLists.txt
+++ b/samples/subsys/shell/fs/CMakeLists.txt
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.13.1)
if((BOARD STREQUAL nrf52840dk_nrf52840) OR
- (BOARD STREQUAL nrf52_pca10040) OR
+ (BOARD STREQUAL nrf52dk_nrf52832) OR
(BOARD STREQUAL nrf9160dk_nrf9160) OR
(BOARD STREQUAL reel_board)
)
diff --git a/scripts/west_commands/runners/core.py b/scripts/west_commands/runners/core.py
index 015366f..392e1be 100644
--- a/scripts/west_commands/runners/core.py
+++ b/scripts/west_commands/runners/core.py
@@ -292,7 +292,7 @@
This class provides an API for these commands. Every subclass is
called a 'runner' for short. Each runner has a name (like
'pyocd'), and declares commands it can handle (like
- 'flash'). Boards (like 'nrf52_pca10040') declare which runner(s)
+ 'flash'). Boards (like 'nrf52dk_nrf52832') declare which runner(s)
are compatible with them to the Zephyr build system, along with
information on how to configure the runner to work with the board.
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index b318083..3bfa70e 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -970,7 +970,7 @@
config BT_CTLR_DEBUG_PINS
bool "Bluetooth Controller Debug Pins"
- depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52_PCA10040 || BOARD_NRF52810_PCA10040 || BOARD_NRF52840DK_NRF52840 || BOARD_RV32M1_VEGA
+ depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52810_PCA10040 || BOARD_NRF52840DK_NRF52840 || BOARD_RV32M1_VEGA
help
Turn on debug GPIO toggling for the BLE Controller. This is useful
when debugging with a logic analyzer or profiling certain sections of
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h
index 5ee4c78..e2904bc 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h
@@ -18,7 +18,7 @@
#define DEBUG_PIN7 BIT(8)
#define DEBUG_PIN8 BIT(10)
#define DEBUG_PIN9 BIT(11)
-#elif defined(CONFIG_BOARD_NRF52_PCA10040) || \
+#elif defined(CONFIG_BOARD_NRF52DK_NRF52832) || \
defined(CONFIG_BOARD_NRF52810_PCA10040)
#define DEBUG_PORT NRF_GPIO
#define DEBUG_PIN0 BIT(11)
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index 98831bd..430a76b 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -75,35 +75,35 @@
platform_whitelist: qemu_cortex_m3
bluetooth.init.test_controller:
extra_args: CONF_FILE=prj_controller.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422 96b_nitrogen
bluetooth.init.test_controller_4_0:
extra_args: CONF_FILE=prj_controller_4_0.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422
bluetooth.init.test_controller_tiny:
extra_args: CONF_FILE=prj_controller_tiny.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422
bluetooth.init.test_controller_dbg:
extra_args: CONF_FILE=prj_controller_dbg.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422 96b_nitrogen
bluetooth.init.test_controller_ll_sw_split:
extra_args: CONF_FILE=prj_controller_ll_sw_split.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422
bluetooth.init.test_controller_4_0_ll_sw_split:
extra_args: CONF_FILE=prj_controller_4_0_ll_sw_split.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422
bluetooth.init.test_controller_tiny_ll_sw_split:
extra_args: CONF_FILE=prj_controller_tiny_ll_sw_split.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422
bluetooth.init.test_controller_dbg_ll_sw_split:
extra_args: CONF_FILE=prj_controller_dbg_ll_sw_split.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
nrf51dk_nrf51422
bluetooth.init.test_h5:
extra_args: CONF_FILE=prj_h5.conf
diff --git a/tests/bluetooth/tester/nrf52_pca10040.overlay b/tests/bluetooth/tester/nrf52dk_nrf52832.overlay
similarity index 100%
rename from tests/bluetooth/tester/nrf52_pca10040.overlay
rename to tests/bluetooth/tester/nrf52dk_nrf52832.overlay
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index 0cf8c8e..444b84b 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -39,7 +39,7 @@
#define ADC_2ND_CHANNEL_ID 2
#define ADC_2ND_CHANNEL_INPUT NRF_ADC_CONFIG_INPUT_3
-#elif defined(CONFIG_BOARD_NRF52_PCA10040) || \
+#elif defined(CONFIG_BOARD_NRF52DK_NRF52832) || \
defined(CONFIG_BOARD_NRF52840DK_NRF52840) || \
defined(CONFIG_BOARD_NRF52840_PCA10059) || \
defined(CONFIG_BOARD_NRF52840_BLIP) || \
diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml
index 7b1dd45..d6bcd44 100644
--- a/tests/drivers/clock_control/clock_control_api/testcase.yaml
+++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml
@@ -1,9 +1,9 @@
tests:
drivers.clock.clock_control_nrf5:
tags: drivers
- platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840dk_nrf52840
+ platform_whitelist: nrf51dk_nrf51422 nrf52dk_nrf52832 nrf52840dk_nrf52840
nrf9160dk_nrf9160
drivers.clock.clock_control_nrf5_lfclk_rc:
tags: drivers
- platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840dk_nrf52840
+ platform_whitelist: nrf51dk_nrf51422 nrf52dk_nrf52832 nrf52840dk_nrf52840
extra_args: CONF_FILE="nrf_lfclk_rc.conf"
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
index 6fb18d7..10b3abc 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
@@ -1,4 +1,4 @@
tests:
drivers.clock.nrf5_clock_calibration:
tags: drivers
- platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840dk_nrf52840
+ platform_whitelist: nrf51dk_nrf51422 nrf52dk_nrf52832 nrf52840dk_nrf52840
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf52_pca10040.conf b/tests/drivers/counter/counter_basic_api/boards/nrf52dk_nrf52832.conf
similarity index 100%
rename from tests/drivers/counter/counter_basic_api/boards/nrf52_pca10040.conf
rename to tests/drivers/counter/counter_basic_api/boards/nrf52dk_nrf52832.conf
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf52_pca10040.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from tests/drivers/counter/counter_basic_api/boards/nrf52_pca10040.overlay
rename to tests/drivers/counter/counter_basic_api/boards/nrf52dk_nrf52832.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52_pca10040.conf b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/nrf52_pca10040.conf
rename to tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.conf
diff --git a/tests/misc/test_build/testcase.yaml b/tests/misc/test_build/testcase.yaml
index 45e45b9..600d839 100644
--- a/tests/misc/test_build/testcase.yaml
+++ b/tests/misc/test_build/testcase.yaml
@@ -6,7 +6,7 @@
bootloader.mcuboot.build:
tags: mcuboot
build_only: true
- platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040
+ platform_whitelist: nrf51dk_nrf51422 nrf52dk_nrf52832
extra_configs:
- CONFIG_BOOTLOADER_MCUBOOT=y
buildsystem.kconfig.utf8_in_values:
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
index ae98761..ac8e94e 100644
--- a/tests/subsys/fs/fcb/testcase.yaml
+++ b/tests/subsys/fs/fcb/testcase.yaml
@@ -1,5 +1,5 @@
tests:
filesystem.fcb:
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832 nrf51dk_nrf51422
native_posix native_posix_64
tags: flash_circural_buffer
diff --git a/tests/subsys/settings/fcb/base64/nrf52_pca10040.overlay b/tests/subsys/settings/fcb/base64/nrf52dk_nrf52832.overlay
similarity index 100%
rename from tests/subsys/settings/fcb/base64/nrf52_pca10040.overlay
rename to tests/subsys/settings/fcb/base64/nrf52dk_nrf52832.overlay
diff --git a/tests/subsys/settings/fcb/base64/testcase.yaml b/tests/subsys/settings/fcb/base64/testcase.yaml
index b7caf85..4d3b247 100644
--- a/tests/subsys/settings/fcb/base64/testcase.yaml
+++ b/tests/subsys/settings/fcb/base64/testcase.yaml
@@ -1,4 +1,4 @@
tests:
system.settings.fcb.base64:
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 native_posix native_posix_64
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832 native_posix native_posix_64
tags: settings_fcb
diff --git a/tests/subsys/settings/fcb/raw/nrf52_pca10040.overlay b/tests/subsys/settings/fcb/raw/nrf52dk_nrf52832.overlay
similarity index 100%
rename from tests/subsys/settings/fcb/raw/nrf52_pca10040.overlay
rename to tests/subsys/settings/fcb/raw/nrf52dk_nrf52832.overlay
diff --git a/tests/subsys/settings/fcb/raw/testcase.yaml b/tests/subsys/settings/fcb/raw/testcase.yaml
index bcd6a45..c3aae1d 100644
--- a/tests/subsys/settings/fcb/raw/testcase.yaml
+++ b/tests/subsys/settings/fcb/raw/testcase.yaml
@@ -1,4 +1,4 @@
tests:
system.settings.fcb.raw:
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 native_posix native_posix_64
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832 native_posix native_posix_64
tags: settings_fcb
diff --git a/tests/subsys/settings/fcb_init/testcase.yaml b/tests/subsys/settings/fcb_init/testcase.yaml
index eb39fb7..c81258d 100644
--- a/tests/subsys/settings/fcb_init/testcase.yaml
+++ b/tests/subsys/settings/fcb_init/testcase.yaml
@@ -1,4 +1,4 @@
tests:
system.settings.fcb:
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832
tags: settings_intialization_fcb
diff --git a/tests/subsys/settings/functional/fcb/boards/nrf52_pca10040.overlay b/tests/subsys/settings/functional/fcb/boards/nrf52dk_nrf52832.overlay
similarity index 100%
rename from tests/subsys/settings/functional/fcb/boards/nrf52_pca10040.overlay
rename to tests/subsys/settings/functional/fcb/boards/nrf52dk_nrf52832.overlay
diff --git a/tests/subsys/settings/functional/fcb/testcase.yaml b/tests/subsys/settings/functional/fcb/testcase.yaml
index 07d746d..52e283e 100644
--- a/tests/subsys/settings/functional/fcb/testcase.yaml
+++ b/tests/subsys/settings/functional/fcb/testcase.yaml
@@ -1,4 +1,4 @@
tests:
system.settings.functional.fcb:
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 native_posix native_posix_64
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832 native_posix native_posix_64
tags: settings_fcb
diff --git a/tests/subsys/settings/functional/file/nrf52_pca10040.overlay b/tests/subsys/settings/functional/file/nrf52dk_nrf52832.overlay
similarity index 100%
rename from tests/subsys/settings/functional/file/nrf52_pca10040.overlay
rename to tests/subsys/settings/functional/file/nrf52dk_nrf52832.overlay
diff --git a/tests/subsys/settings/functional/file/testcase.yaml b/tests/subsys/settings/functional/file/testcase.yaml
index ce67161..87f371d 100644
--- a/tests/subsys/settings/functional/file/testcase.yaml
+++ b/tests/subsys/settings/functional/file/testcase.yaml
@@ -1,4 +1,4 @@
tests:
system.settings.file:
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 native_posix native_posix_64
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832 native_posix native_posix_64
tags: settings_file
diff --git a/tests/subsys/storage/flash_map/testcase.yaml b/tests/subsys/storage/flash_map/testcase.yaml
index ea4f675..e3521c3 100644
--- a/tests/subsys/storage/flash_map/testcase.yaml
+++ b/tests/subsys/storage/flash_map/testcase.yaml
@@ -4,6 +4,6 @@
tags: flash_map
storage.flash_map.mpu:
extra_args: OVERLAY_CONFIG=overlay-mpu.conf
- platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 frdm_k64f hexiwear_k64
+ platform_whitelist: nrf52840dk_nrf52840 nrf52dk_nrf52832 frdm_k64f hexiwear_k64
twr_ke18f
tags: flash_map
