diff --git a/boards/arm/nrf52811_pca10056/doc/index.rst b/boards/arm/nrf52811_pca10056/doc/index.rst index fae5def3f78..2271c6ff29d 100644 --- a/boards/arm/nrf52811_pca10056/doc/index.rst +++ b/boards/arm/nrf52811_pca10056/doc/index.rst @@ -7,12 +7,12 @@ Overview ******** The nrf52811_pca10056 board is a modified version of the -:ref:`nrf52840_pca10056` that enforces the limitations imposed by the nRF52811 +: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:`nrf52840_pca10056` for more information about the development board +See :ref:`nrf52840dk_nrf52840` for more information about the development board and `nRF52811 website`_ for the official reference on the IC itself. References diff --git a/boards/arm/nrf52840_blip/nrf52840_blip.dts b/boards/arm/nrf52840_blip/nrf52840_blip.dts index 5347dad1d39..ffcc342ce7e 100644 --- a/boards/arm/nrf52840_blip/nrf52840_blip.dts +++ b/boards/arm/nrf52840_blip/nrf52840_blip.dts @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 Linaro Limited * - * Based on nrf52840_pca10056.dts + * Based on nrf52840dk_nrf52840.dts * modified 2018 Tavish Naruka * * SPDX-License-Identifier: Apache-2.0 diff --git a/boards/arm/nrf52840_pca10056/Kconfig b/boards/arm/nrf52840dk_nrf52840/Kconfig similarity index 67% rename from boards/arm/nrf52840_pca10056/Kconfig rename to boards/arm/nrf52840dk_nrf52840/Kconfig index d7e7631ceb3..5ae27b6b4a0 100644 --- a/boards/arm/nrf52840_pca10056/Kconfig +++ b/boards/arm/nrf52840dk_nrf52840/Kconfig @@ -1,4 +1,4 @@ -# nRF52840 PCA10056 board configuration +# nRF52840 DK NRF52840 board configuration # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 @@ -7,4 +7,4 @@ config BOARD_ENABLE_DCDC bool "Enable DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_NRF52840_PCA10056 + depends on BOARD_NRF52840DK_NRF52840 diff --git a/boards/arm/nrf52840_pca10056/Kconfig.board b/boards/arm/nrf52840dk_nrf52840/Kconfig.board similarity index 52% rename from boards/arm/nrf52840_pca10056/Kconfig.board rename to boards/arm/nrf52840dk_nrf52840/Kconfig.board index af87e2f644f..dcfdb550a43 100644 --- a/boards/arm/nrf52840_pca10056/Kconfig.board +++ b/boards/arm/nrf52840dk_nrf52840/Kconfig.board @@ -1,8 +1,8 @@ -# nRF52840 PCA10056 board configuration +# nRF52840 DK NRF52840 board configuration # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -config BOARD_NRF52840_PCA10056 - bool "NRF52840 PCA10056" +config BOARD_NRF52840DK_NRF52840 + bool "nRF52840 DK NRF52840" depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_pca10056/Kconfig.defconfig b/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig similarity index 77% rename from boards/arm/nrf52840_pca10056/Kconfig.defconfig rename to boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig index 865203213f6..a772ca6f38e 100644 --- a/boards/arm/nrf52840_pca10056/Kconfig.defconfig +++ b/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig @@ -1,12 +1,12 @@ -# nRF52840 PCA10056 board configuration +# nRF52840 DK NRF52840 board configuration # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_PCA10056 +if BOARD_NRF52840DK_NRF52840 config BOARD - default "nrf52840_pca10056" + default "nrf52840dk_nrf52840" config ADC_0 default y @@ -47,4 +47,4 @@ config IEEE802154_NRF5 config BT_CTLR default BT -endif # BOARD_NRF52840_PCA10056 +endif # BOARD_NRF52840DK_NRF52840 diff --git a/boards/arm/nrf52840_pca10056/board.cmake b/boards/arm/nrf52840dk_nrf52840/board.cmake similarity index 100% rename from boards/arm/nrf52840_pca10056/board.cmake rename to boards/arm/nrf52840dk_nrf52840/board.cmake diff --git a/boards/arm/nrf52840_pca10056/doc/img/nrf52840_pca10056.jpg b/boards/arm/nrf52840dk_nrf52840/doc/img/nrf52840dk_nrf52840.jpg similarity index 100% rename from boards/arm/nrf52840_pca10056/doc/img/nrf52840_pca10056.jpg rename to boards/arm/nrf52840dk_nrf52840/doc/img/nrf52840dk_nrf52840.jpg diff --git a/boards/arm/nrf52840_pca10056/doc/index.rst b/boards/arm/nrf52840dk_nrf52840/doc/index.rst similarity index 92% rename from boards/arm/nrf52840_pca10056/doc/index.rst rename to boards/arm/nrf52840dk_nrf52840/doc/index.rst index 27e3fd7c0e4..4c5adcb23ba 100644 --- a/boards/arm/nrf52840_pca10056/doc/index.rst +++ b/boards/arm/nrf52840dk_nrf52840/doc/index.rst @@ -1,7 +1,7 @@ -.. _nrf52840_pca10056: +.. _nrf52840dk_nrf52840: -nRF52840-PCA10056 -################# +nRF52840 DK +########### Overview ******** @@ -25,17 +25,21 @@ Nordic Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices: * :abbr:`USB (Universal Serial Bus)` * :abbr:`WDT (Watchdog Timer)` -.. figure:: img/nrf52840_pca10056.jpg +.. figure:: img/nrf52840dk_nrf52840.jpg :width: 442px :align: center - :alt: nRF52840 PCA10056 DK + :alt: nRF52840 DK - nRF52840 PCA10056 DK (Credit: Nordic Semiconductor) + nRF52840 DK (Credit: Nordic Semiconductor) More information about the board can be found at the `nRF52840 DK website`_. The `Nordic Semiconductor Infocenter`_ contains the processor's information and the datasheet. +.. note:: + + In earlier Zephyr releases this board was known as ``nrf52840_pca10056``. + Hardware ******** @@ -45,7 +49,7 @@ is 32.768 kHz. The frequency of the main clock is 32 MHz. Supported Features ================== -The nrf52840_pca10056 board configuration supports the following +The nrf52840dk_nrf52840 board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -110,7 +114,7 @@ Push buttons Programming and Debugging ************************* -Applications for the ``nrf52840_pca10056`` board configuration can be +Applications for the ``nrf52840dk_nrf52840`` board configuration can be built and flashed in the usual way (see :ref:`build_an_application` and :ref:`application_run` for more details); however, the standard debugging targets are not currently available. @@ -132,14 +136,14 @@ First, run your favorite terminal program to listen for output. $ minicom -D -b 115200 -Replace :code:`` with the port where the board nRF52 DK +Replace :code:`` with the port where the board nRF52840 DK can be found. For example, under Linux, :code:`/dev/ttyACM0`. Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build flash Debugging @@ -162,7 +166,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/nrf52840_pca10056/nrf52840_pca10056.dts`. +:zephyr_file:`boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts`. Using UART1 *********** @@ -174,7 +178,7 @@ more than one UART for connecting peripheral devices: .. code-block:: console - $ cat nrf52840_pca10056.overlay + $ cat nrf52840dk_nrf52840.overlay &uart1 { compatible = "nordic,nrf-uarte"; current-speed = <115200>; diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts similarity index 98% rename from boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts rename to boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts index 65c1a582eb6..0bc9cbd09cd 100644 --- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts +++ b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts @@ -8,8 +8,8 @@ #include / { - model = "Nordic PCA10056 Dev Kit"; - compatible = "nordic,pca10056-dk", "nordic,nrf52840-qiaa", + model = "Nordic nRF52840 DK NRF52840"; + compatible = "nordic,nrf52840-dk-nrf52840", "nordic,nrf52840-qiaa", "nordic,nrf52840"; chosen { diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056.yaml b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.yaml similarity index 79% rename from boards/arm/nrf52840_pca10056/nrf52840_pca10056.yaml rename to boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.yaml index 589ced6cdcd..1e0b07923e7 100644 --- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056.yaml +++ b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.yaml @@ -1,5 +1,5 @@ -identifier: nrf52840_pca10056 -name: nRF52840-PCA10056 +identifier: nrf52840dk_nrf52840 +name: nRF52840-DK-NRF52840 type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig similarity index 91% rename from boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig rename to boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig index 62b4c9eb59f..972e0e42d74 100644 --- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig +++ b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840_PCA10056=y +CONFIG_BOARD_NRF52840DK_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake index fe618b596b4..8686cae45f9 100644 --- a/boards/deprecated.cmake +++ b/boards/deprecated.cmake @@ -9,3 +9,4 @@ # set(_DEPRECATED ) set(nrf51_pca10028_DEPRECATED nrf51dk_nrf51422) +set(nrf52840_pca10056_DEPRECATED nrf52840dk_nrf52840) diff --git a/boards/shields/adafruit_2_8_tft_touch_v2/doc/index.rst b/boards/shields/adafruit_2_8_tft_touch_v2/doc/index.rst index 24958e97307..6d27dec8d5b 100644 --- a/boards/shields/adafruit_2_8_tft_touch_v2/doc/index.rst +++ b/boards/shields/adafruit_2_8_tft_touch_v2/doc/index.rst @@ -54,7 +54,7 @@ Set ``-DSHIELD=adafruit_2_8_tft_touch_v2`` when you invoke ``west build``. For e .. zephyr-app-commands:: :zephyr-app: samples/gui/lvgl - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :shield: adafruit_2_8_tft_touch_v2 :goals: build diff --git a/boards/shields/sparkfun_sara_r4/boards/nrf52840_pca10056.defconfig b/boards/shields/sparkfun_sara_r4/boards/nrf52840dk_nrf52840.defconfig similarity index 69% rename from boards/shields/sparkfun_sara_r4/boards/nrf52840_pca10056.defconfig rename to boards/shields/sparkfun_sara_r4/boards/nrf52840dk_nrf52840.defconfig index 3af8bc1f0b6..741eadcb0da 100644 --- a/boards/shields/sparkfun_sara_r4/boards/nrf52840_pca10056.defconfig +++ b/boards/shields/sparkfun_sara_r4/boards/nrf52840dk_nrf52840.defconfig @@ -1,7 +1,7 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_PCA10056 +if BOARD_NRF52840DK_NRF52840 config GPIO_NRF_P1 default y @@ -9,4 +9,4 @@ config GPIO_NRF_P1 config UART_1_NRF_UARTE default y -endif # BOARD_NRF52840_PCA10056 +endif # BOARD_NRF52840DK_NRF52840 diff --git a/boards/shields/sparkfun_sara_r4/boards/nrf52840_pca10056.overlay b/boards/shields/sparkfun_sara_r4/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from boards/shields/sparkfun_sara_r4/boards/nrf52840_pca10056.overlay rename to boards/shields/sparkfun_sara_r4/boards/nrf52840dk_nrf52840.overlay diff --git a/boards/shields/st7789v_generic/doc/index.rst b/boards/shields/st7789v_generic/doc/index.rst index eb4be7c0e9b..917d19c4452 100644 --- a/boards/shields/st7789v_generic/doc/index.rst +++ b/boards/shields/st7789v_generic/doc/index.rst @@ -57,7 +57,7 @@ Set ``-DSHIELD=st7789v_tl019fqv01`` when you invoke ``west build``. For example: .. zephyr-app-commands:: :zephyr-app: samples/gui/lvgl - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :shield: st7789v_tl019fqv01 :goals: build diff --git a/boards/shields/waveshare_epaper/doc/index.rst b/boards/shields/waveshare_epaper/doc/index.rst index e4c07391eac..355d5c17e88 100644 --- a/boards/shields/waveshare_epaper/doc/index.rst +++ b/boards/shields/waveshare_epaper/doc/index.rst @@ -77,7 +77,7 @@ For example: .. zephyr-app-commands:: :zephyr-app: samples/gui/lvgl - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :shield: waveshare_epaper_gdeh0213b1 :goals: build diff --git a/boards/shields/wnc_m14a2a/boards/nrf52840_pca10056.defconfig b/boards/shields/wnc_m14a2a/boards/nrf52840dk_nrf52840.defconfig similarity index 74% rename from boards/shields/wnc_m14a2a/boards/nrf52840_pca10056.defconfig rename to boards/shields/wnc_m14a2a/boards/nrf52840dk_nrf52840.defconfig index 80b199e1e9e..c33ff69fb28 100644 --- a/boards/shields/wnc_m14a2a/boards/nrf52840_pca10056.defconfig +++ b/boards/shields/wnc_m14a2a/boards/nrf52840dk_nrf52840.defconfig @@ -1,7 +1,7 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_PCA10056 +if BOARD_NRF52840DK_NRF52840 config GPIO_NRF_P1 default y @@ -12,4 +12,4 @@ config UART_1_NRF_UARTE config UART_1_NRF_FLOW_CONTROL default y -endif # BOARD_NRF52840_PCA10056 +endif # BOARD_NRF52840DK_NRF52840 diff --git a/boards/shields/wnc_m14a2a/boards/nrf52840_pca10056.overlay b/boards/shields/wnc_m14a2a/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from boards/shields/wnc_m14a2a/boards/nrf52840_pca10056.overlay rename to boards/shields/wnc_m14a2a/boards/nrf52840dk_nrf52840.overlay diff --git a/cmake/extensions.cmake b/cmake/extensions.cmake index b0b05fe1026..9efc4cc9184 100644 --- a/cmake/extensions.cmake +++ b/cmake/extensions.cmake @@ -1413,7 +1413,7 @@ function(toolchain_parse_make_rule input_file include_files) # The file is formatted like this: # empty_file.o: misc/empty_file.c \ - # nrf52840_pca10056/nrf52840_pca10056.dts \ + # nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts \ # nrf52840_qiaa.dtsi # Get rid of the backslashes diff --git a/doc/conf.py b/doc/conf.py index 096f2e0c470..748c94f4fc4 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -341,7 +341,8 @@ html_redirect_pages = [ ('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/nrf52810_pca10040/doc/nrf52810_pca10040', 'boards/arm/nrf52810_pca10040/doc/index'), - ('boards/arm/nrf52840_pca10056/doc/nrf52840_pca10056', 'boards/arm/nrf52840_pca10056/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_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'), diff --git a/doc/guides/test/sanitycheck.rst b/doc/guides/test/sanitycheck.rst index c26e65ff385..6075842ae3b 100644 --- a/doc/guides/test/sanitycheck.rst +++ b/doc/guides/test/sanitycheck.rst @@ -511,7 +511,7 @@ devices, for example:: Any options marked as 'unknown' need to be changed and set with the correct values, in the above example both the platform names and the runners need to be replaced with the correct values corresponding to the connected hardware. In -this example we are using a reel_board and an nrf52840_pca10056:: +this example we are using a reel_board and an nrf52840dk_nrf52840:: - available: true id: OSHW000032254e4500128002ab98002784d1000097969900 @@ -521,7 +521,7 @@ this example we are using a reel_board and an nrf52840_pca10056:: serial: /dev/cu.usbmodem146114202 - available: true id: 000683759358 - platform: nrf52840_pca10056 + platform: nrf52840dk_nrf52840 product: J-Link runner: nrfjprog serial: /dev/cu.usbmodem0006837593581 diff --git a/samples/application_development/out_of_tree_board/CMakeLists.txt b/samples/application_development/out_of_tree_board/CMakeLists.txt index 1ef7e0c0efd..c0da1c4aa77 100644 --- a/samples/application_development/out_of_tree_board/CMakeLists.txt +++ b/samples/application_development/out_of_tree_board/CMakeLists.txt @@ -5,10 +5,10 @@ cmake_minimum_required(VERSION 3.13.1) # $ZEPHYR_BASE to this directory. set(BOARD_ROOT ${CMAKE_CURRENT_LIST_DIR}) -# This sample is only compatible with nrf52840_pca10065 because it has +# This sample is only compatible with nrf52840dk_nrf52840 because it has # re-directed the 'boards' directory to a directory that only contains # this board. -set(BOARD nrf52840_pca10056) +set(BOARD nrf52840dk_nrf52840) include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) project(out_of_tree_board) diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig similarity index 60% rename from samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig rename to samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig index 9b4cad1ebcd..7e4567c275a 100644 --- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig +++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig @@ -1,12 +1,12 @@ -# nRF52840 PCA10056 board configuration +# nRF52840 DK NRF52840 board configuration # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_PCA10056 +if BOARD_NRF52840DK_NRF52840 config GPIO_AS_PINRESET bool "GPIO as pin reset (reset button)" default y -endif # BOARD_NRF52840_PCA10056 +endif # BOARD_NRF52840DK_NRF52840 diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.board b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig.board similarity index 56% rename from samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.board rename to samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig.board index 4a05cf4fa68..58591bda505 100644 --- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.board +++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig.board @@ -1,9 +1,9 @@ -# nRF52840 PCA10056 board configuration +# nRF52840 DK NRF52840 board configuration # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -config BOARD_NRF52840_PCA10056 - bool "NRF52840 PCA10056" +config BOARD_NRF52840DK_NRF52840 + bool "nRF52840 DK NRF52840" select HAS_DTS_GPIO depends on SOC_NRF52840_QIAA diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.defconfig b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig similarity index 57% rename from samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.defconfig rename to samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig index 5ee158abf55..989b11776df 100644 --- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.defconfig +++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig @@ -1,12 +1,12 @@ -# nRF52 PCA10040 board configuration +# nRF52840 DK NRF52840 board configuration # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_PCA10056 +if BOARD_NRF52840DK_NRF52840 config BOARD - default "nrf52840_pca10056" + default "nrf52840dk_nrf52840" if USB @@ -18,4 +18,4 @@ config USB_DEVICE_STACK endif # USB -endif # BOARD_NRF52840_PCA10056 +endif # BOARD_NRF52840DK_NRF52840 diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/board.cmake b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/board.cmake similarity index 100% rename from samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/board.cmake rename to samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/board.cmake diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840_pca10056_defconfig similarity index 91% rename from samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig rename to samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840_pca10056_defconfig index 5e8db1c43f7..678b1d500a8 100644 --- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig +++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840_pca10056_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840_PCA10056=y +CONFIG_BOARD_NRF52840DK_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts similarity index 93% rename from samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts rename to samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts index f755c353c3c..c182f2714a0 100644 --- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts +++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts @@ -8,8 +8,8 @@ #include / { - model = "Nordic PCA10056 Dev Kit"; - compatible = "nordic,pca10056-dk", "nordic,nrf52840-qiaa", + model = "Nordic nRF52840 DK NRF52840"; + compatible = "nordic,nrf52840-dk-nrf52840", "nordic,nrf52840-qiaa", "nordic,nrf52840"; chosen { diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.yaml b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.yaml similarity index 64% rename from samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.yaml rename to samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.yaml index 96b6b31ed83..6668fdd82c5 100644 --- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.yaml +++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.yaml @@ -1,5 +1,5 @@ -identifier: nrf52840_pca10056 -name: nRF52840-PCA10056 +identifier: nrf52840dk_nrf52840 +name: nRF52840-DK-NRF52840 type: mcu arch: arm toolchain: diff --git a/samples/application_development/out_of_tree_board/sample.yaml b/samples/application_development/out_of_tree_board/sample.yaml index a87bf8b7f07..802d851abd1 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 @@ sample: tests: sample.app_dev.out_of_tree: tags: out_of_tree - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 harness: console harness_config: type: one_line diff --git a/samples/basic/blink_led/README.rst b/samples/basic/blink_led/README.rst index e29d699c9fc..a9b7a6f4f4c 100644 --- a/samples/basic/blink_led/README.rst +++ b/samples/basic/blink_led/README.rst @@ -42,19 +42,19 @@ Hexiwear K64 No special board setup is necessary because there is an on-board RGB LED connected to the K64 PWM. -nrf52840_pca10056 -================= +nrf52840dk_nrf52840 +=================== No special board setup is necessary because there is an on-board LED connected. Building and Running ******************** This sample can be built for multiple boards, in this example we will build it -for the nrf52840_pca10056 board: +for the nrf52840dk_nrf52840 board: .. zephyr-app-commands:: :zephyr-app: samples/basic/blink_led - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build flash :compact: diff --git a/samples/basic/fade_led/README.rst b/samples/basic/fade_led/README.rst index 80bee78d355..0f5fed32ada 100644 --- a/samples/basic/fade_led/README.rst +++ b/samples/basic/fade_led/README.rst @@ -35,18 +35,18 @@ Hexiwear K64 No special board setup is necessary because there is an on-board RGB LED connected to the K64 PWM. -nrf52840_pca10056 -================= +nrf52840dk_nrf52840 +=================== No special board setup is necessary because there is an on-board LED connected. Building and Running ******************** This sample can be built for multiple boards, in this example we will build it -for the nrf52840_pca10056 board: +for the nrf52840dk_nrf52840 board: .. zephyr-app-commands:: :zephyr-app: samples/basic/fade_led - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build flash :compact: diff --git a/samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf b/samples/bluetooth/hci_uart/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from samples/bluetooth/hci_uart/boards/nrf52840_pca10056.conf rename to samples/bluetooth/hci_uart/boards/nrf52840dk_nrf52840.conf diff --git a/samples/bluetooth/hci_uart/nrf52840_pca10056.overlay b/samples/bluetooth/hci_uart/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/bluetooth/hci_uart/nrf52840_pca10056.overlay rename to samples/bluetooth/hci_uart/nrf52840dk_nrf52840.overlay diff --git a/samples/bluetooth/hci_usb/README.rst b/samples/bluetooth/hci_usb/README.rst index d078933ff41..91e4fb7f4fc 100644 --- a/samples/bluetooth/hci_usb/README.rst +++ b/samples/bluetooth/hci_usb/README.rst @@ -7,7 +7,7 @@ Overview ******** Make a USB Bluetooth dongle out of Zephyr. Requires USB device support from the -board it runs on (e.g. :ref:`nrf52840_pca10056` supports both BLE and USB). +board it runs on (e.g. :ref:`nrf52840dk_nrf52840` supports both BLE and USB). Requirements ************ diff --git a/samples/bluetooth/ipsp/README.rst b/samples/bluetooth/ipsp/README.rst index 1f3591b3993..b57a6ab5a06 100644 --- a/samples/bluetooth/ipsp/README.rst +++ b/samples/bluetooth/ipsp/README.rst @@ -14,11 +14,11 @@ Building and Running This sample can be found under :zephyr_file:`samples/bluetooth/ipsp` in the Zephyr tree. -Sample can be built and executed for the nRF52840 PCA10056 as follows: +Sample can be built and executed for the nRF52840 DK NRF52840 as follows: .. zephyr-app-commands:: :zephyr-app: samples/bluetooth/ipsp - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build flash :compact: @@ -33,7 +33,7 @@ Building and Running for Linux kernels released before 4.12 .. zephyr-app-commands:: :zephyr-app: samples/bluetooth/ipsp - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :conf: "prj_zep1656.conf" :goals: build flash :compact: diff --git a/samples/boards/nrf/mesh/onoff-app/README.rst b/samples/boards/nrf/mesh/onoff-app/README.rst index a7b270c65b6..a219cfade5d 100644 --- a/samples/boards/nrf/mesh/onoff-app/README.rst +++ b/samples/boards/nrf/mesh/onoff-app/README.rst @@ -50,7 +50,7 @@ The following commands build the application. .. zephyr-app-commands:: :zephyr-app: samples/boards/nrf/mesh/onoff-app - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build flash :compact: diff --git a/samples/boards/nrf/mesh/onoff-app/sample.yaml b/samples/boards/nrf/mesh/onoff-app/sample.yaml index a52562a9897..1024a7a41c4 100644 --- a/samples/boards/nrf/mesh/onoff-app/sample.yaml +++ b/samples/boards/nrf/mesh/onoff-app/sample.yaml @@ -2,6 +2,6 @@ sample: name: Bluetooth Mesh tests: sample.bluetooth.mesh.onoff: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 tags: bluetooth harness: bluetooth 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 935b0e1ba0b..64d323e0982 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 @@ -67,7 +67,7 @@ The following commands build the application. .. zephyr-app-commands:: :zephyr-app: samples/boards/nrf/mesh/onoff_level_lighting_vnd_app - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build flash :compact: diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/sample.yaml b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/sample.yaml index 53a7aef9538..8a3a451bff0 100644 --- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/sample.yaml +++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/sample.yaml @@ -2,6 +2,6 @@ sample: name: Bluetooth Mesh tests: sample.bluetooth.mesh.onoff_level_lighting_vnd: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 tags: bluetooth harness: bluetooth diff --git a/samples/boards/nrf/system_off/sample.yaml b/samples/boards/nrf/system_off/sample.yaml index 7b711397dd3..697c11f387c 100644 --- a/samples/boards/nrf/system_off/sample.yaml +++ b/samples/boards/nrf/system_off/sample.yaml @@ -3,5 +3,5 @@ sample: tests: sample.boards.nrf.system_off: build_only: true - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 nrf51dk_nrf51422 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 tags: power diff --git a/samples/display/lvgl/README.rst b/samples/display/lvgl/README.rst index adbd3af52e6..969bd6f5b5d 100644 --- a/samples/display/lvgl/README.rst +++ b/samples/display/lvgl/README.rst @@ -18,7 +18,7 @@ Requirements Display shield and a board which provides a configuration for Arduino connectors, for example: -- :ref:`adafruit_2_8_tft_touch_v2` and :ref:`nrf52840_pca10056` +- :ref:`adafruit_2_8_tft_touch_v2` and :ref:`nrf52840dk_nrf52840` - :ref:`ssd1306_128_shield` and :ref:`frdm_k64f` or a simulated display environment in a native Posix application: @@ -39,11 +39,11 @@ or Building and Running ******************** -Example building for :ref:`nrf52840_pca10056`: +Example building for :ref:`nrf52840dk_nrf52840`: .. zephyr-app-commands:: :zephyr-app: samples/gui/lvgl - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :shield: adafruit_2_8_tft_touch_v2 :goals: build flash diff --git a/samples/display/lvgl/sample.yaml b/samples/display/lvgl/sample.yaml index cddac440026..81162fa8979 100644 --- a/samples/display/lvgl/sample.yaml +++ b/samples/display/lvgl/sample.yaml @@ -7,18 +7,18 @@ tests: platform_whitelist: reel_board mimxrt1050_evk mimxrt1060_evk mimxrt1064_evk tags: samples display gui sample.display.adafruit_2_8_tft_touch_v2: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=adafruit_2_8_tft_touch_v2 tags: shield sample.display.waveshare_epaper_gdeh0213b1: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=waveshare_epaper_gdeh0213b1 tags: shield sample.display.waveshare_epaper_gdeh0213b72: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=waveshare_epaper_gdeh0213b72 tags: shield sample.display.waveshare_epaper_gdeh029a1: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=waveshare_epaper_gdeh029a1 tags: shield diff --git a/samples/drivers/counter/alarm/sample.yaml b/samples/drivers/counter/alarm/sample.yaml index ea0aaf56271..bb9ecfe0796 100644 --- a/samples/drivers/counter/alarm/sample.yaml +++ b/samples/drivers/counter/alarm/sample.yaml @@ -5,7 +5,7 @@ tests: tags: drivers harness: console platform_whitelist: nucleo_f746zg nrf51dk_nrf51422 nrf52_pca10040 - nrf52840_pca10056 nrf9160_pca10090 + nrf52840dk_nrf52840 nrf9160_pca10090 harness_config: type: multi_line ordered: true diff --git a/samples/drivers/display/README.rst b/samples/drivers/display/README.rst index 84f914366ef..de774646789 100644 --- a/samples/drivers/display/README.rst +++ b/samples/drivers/display/README.rst @@ -19,12 +19,12 @@ Building and Running As this is a generic sample it should work with any display supported by Zephyr. -Below is an example on how to build for a :ref:`nrf52840_pca10056` board with a +Below is an example on how to build for a :ref:`nrf52840dk_nrf52840` board with a :ref:`adafruit_2_8_tft_touch_v2`. .. zephyr-app-commands:: :zephyr-app: samples/drivers/display - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build :shield: adafruit_2_8_tft_touch_v2 :compact: diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml index 0b18c9e3595..128a6bc09e7 100644 --- a/samples/drivers/display/sample.yaml +++ b/samples/drivers/display/sample.yaml @@ -3,19 +3,19 @@ sample: name: display_sample tests: sample.display.shield.adafruit_2_8_tft_touch_v2: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=adafruit_2_8_tft_touch_v2 tags: display shield sample.display.shield.ssd1306_128x32: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=ssd1306_128x32 tags: display shield sample.display.shield.ssd1306_128x64: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=ssd1306_128x64 tags: display shield sample.display.shield.waveshare_epaper_gdeh0213b1: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_args: SHIELD=waveshare_epaper_gdeh0213b1 sample.display.st7789v_tl019fqv01: platform_whitelist: nrf52_pca10040 diff --git a/samples/drivers/ht16k33/README.rst b/samples/drivers/ht16k33/README.rst index f00f223273e..01b899d5ff5 100644 --- a/samples/drivers/ht16k33/README.rst +++ b/samples/drivers/ht16k33/README.rst @@ -22,17 +22,17 @@ The sample logs keyscan events on the console. Building and Running ******************** -Build the application for the :ref:`nrf52840_pca10056` board, and +Build the application for the :ref:`nrf52840dk_nrf52840` board, and connect a HT16K33 LED driver at address 0x70 on the I2C-0 bus. .. zephyr-app-commands:: :zephyr-app: samples/drivers/ht16k33 - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build :compact: For flashing the application, refer to the Flashing section of the -:ref:`nrf52840_pca10056` board documentation. +:ref:`nrf52840dk_nrf52840` board documentation. References ********** diff --git a/samples/drivers/ht16k33/nrf52840_pca10056.overlay b/samples/drivers/ht16k33/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/drivers/ht16k33/nrf52840_pca10056.overlay rename to samples/drivers/ht16k33/nrf52840dk_nrf52840.overlay diff --git a/samples/drivers/ht16k33/sample.yaml b/samples/drivers/ht16k33/sample.yaml index 566afde1910..fc2a02db6fb 100644 --- a/samples/drivers/ht16k33/sample.yaml +++ b/samples/drivers/ht16k33/sample.yaml @@ -3,6 +3,6 @@ sample: name: HT16K33 sample tests: sample.drivers.ht16k33: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 harness: TBD tags: LED diff --git a/samples/drivers/led_lp5562/README.rst b/samples/drivers/led_lp5562/README.rst index 3db188baff7..9f141507612 100644 --- a/samples/drivers/led_lp5562/README.rst +++ b/samples/drivers/led_lp5562/README.rst @@ -29,16 +29,16 @@ mappings used by this sample. Building and Running ******************** -Build the application for the :ref:`nrf52840_pca10056` board, and connect +Build the application for the :ref:`nrf52840dk_nrf52840` board, and connect a LP5562 LED driver on the bus I2C0 at the address 0x30. .. zephyr-app-commands:: :zephyr-app: samples/drivers/led_lp5562 - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build :compact: For flashing the application, refer to the Flashing section of the -:ref:`nrf52840_pca10056` board documentation. +:ref:`nrf52840dk_nrf52840` board documentation. .. _LP5562 Manual: http://www.ti.com/lit/ds/symlink/lp5562.pdf diff --git a/samples/drivers/led_lp5562/boards/nrf52840_pca10056.conf b/samples/drivers/led_lp5562/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from samples/drivers/led_lp5562/boards/nrf52840_pca10056.conf rename to samples/drivers/led_lp5562/boards/nrf52840dk_nrf52840.conf diff --git a/samples/drivers/led_lp5562/boards/nrf52840_pca10056.overlay b/samples/drivers/led_lp5562/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/drivers/led_lp5562/boards/nrf52840_pca10056.overlay rename to samples/drivers/led_lp5562/boards/nrf52840dk_nrf52840.overlay diff --git a/samples/drivers/led_lp5562/sample.yaml b/samples/drivers/led_lp5562/sample.yaml index 61699cbc87e..ba94531b1a9 100644 --- a/samples/drivers/led_lp5562/sample.yaml +++ b/samples/drivers/led_lp5562/sample.yaml @@ -3,6 +3,6 @@ sample: name: LP5562 sample tests: sample.drivers.led.lp5562: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 tags: led harness: TBD diff --git a/samples/drivers/spi_flash/boards/nrf52840_pca10056.conf b/samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from samples/drivers/spi_flash/boards/nrf52840_pca10056.conf rename to samples/drivers/spi_flash/boards/nrf52840dk_nrf52840.conf diff --git a/samples/net/lwm2m_client/sample.yaml b/samples/net/lwm2m_client/sample.yaml index 39f89212350..298c2b78c82 100644 --- a/samples/net/lwm2m_client/sample.yaml +++ b/samples/net/lwm2m_client/sample.yaml @@ -16,7 +16,7 @@ tests: sample.net.lwm2m_client.bt: harness: net extra_args: OVERLAY_CONFIG=overlay-bt.conf - platform_whitelist: nrf52_pca10040 nrf52840_pca10056 disco_l475_iot1 + platform_whitelist: nrf52_pca10040 nrf52840dk_nrf52840 disco_l475_iot1 tags: net lwm2m sample.net.lwm2m_client.queue_mode: harness: net @@ -27,5 +27,5 @@ tests: sample.net.lwm2m_client.wnc_m14a2a: harness: net extra_args: SHIELD=wnc_m14a2a - platform_whitelist: frdm_k64f nrf52840_pca10056 + platform_whitelist: frdm_k64f nrf52840dk_nrf52840 tags: net lwm2m diff --git a/samples/net/sockets/echo_client/README.rst b/samples/net/sockets/echo_client/README.rst index b43714ece36..e051527d639 100644 --- a/samples/net/sockets/echo_client/README.rst +++ b/samples/net/sockets/echo_client/README.rst @@ -59,12 +59,12 @@ Build echo-client sample application like this: :goals: build :compact: -Example building for the nRF52840_pca10056 with OpenThread support: +Example building for the nrf52840dk_nrf52840 with OpenThread support: .. zephyr-app-commands:: :zephyr-app: samples/net/sockets/echo_client :host-os: unix - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :conf: "prj.conf overlay-ot.conf" :goals: run :compact: diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml index b688edfe211..07fa94287bd 100644 --- a/samples/net/sockets/echo_client/sample.yaml +++ b/samples/net/sockets/echo_client/sample.yaml @@ -23,12 +23,12 @@ tests: platform_whitelist: frdm_k64f sample.net.sockets.echo_client.nrf_802154: extra_args: OVERLAY_CONFIG="overlay-802154.conf" - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 sample.net.sockets.echo_client.nrf_openthread: extra_args: OVERLAY_CONFIG="overlay-ot.conf" slow: true tags: net openthread - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 sample.net.sockets.echo_client.kw41z_openthread: extra_args: OVERLAY_CONFIG="overlay-ot.conf" slow: true diff --git a/samples/net/sockets/echo_server/README.rst b/samples/net/sockets/echo_server/README.rst index 647891c2de1..e2efde2c0f4 100644 --- a/samples/net/sockets/echo_server/README.rst +++ b/samples/net/sockets/echo_server/README.rst @@ -68,7 +68,7 @@ Example building for the nRF52840_pca10056 with OpenThread support: .. zephyr-app-commands:: :zephyr-app: samples/net/sockets/echo_server :host-os: unix - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :conf: "prj.conf overlay-ot.conf" :goals: run :compact: diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml index fca019485b4..1433923e83d 100644 --- a/samples/net/sockets/echo_server/sample.yaml +++ b/samples/net/sockets/echo_server/sample.yaml @@ -23,7 +23,7 @@ tests: platform_whitelist: frdm_k64f sample.net.sockets.echo_server.nrf_802154: extra_args: OVERLAY_CONFIG="overlay-802154.conf" - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 sample.net.sockets.echo_server.usbnet: depends_on: usb_device harness: net @@ -40,7 +40,7 @@ tests: extra_args: OVERLAY_CONFIG="overlay-ot.conf" slow: true tags: net openthread - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 sample.net.sockets.echo_server.kw41z_openthread: extra_args: OVERLAY_CONFIG="overlay-ot.conf" slow: true diff --git a/samples/net/wpanusb/README.rst b/samples/net/wpanusb/README.rst index 4c1a2f7ea85..4b07265328f 100644 --- a/samples/net/wpanusb/README.rst +++ b/samples/net/wpanusb/README.rst @@ -16,7 +16,7 @@ Requirements ************ - a Zephyr board with supported 802.15.4 radio and supported USB driver - (such as the :ref:`nrf52840_pca10056` or :ref:`atsamr21_xpro`) + (such as the :ref:`nrf52840dk_nrf52840` or :ref:`atsamr21_xpro`) connected via USB to a Linux host - wpanusb Linux kernel driver (in the process of being open sourced) - wpan-tools (available for all Linux distributions) @@ -47,7 +47,7 @@ Example building for the Nordic nRF52840 Development Kit: .. zephyr-app-commands:: :zephyr-app: samples/net/wpanusb - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build :compact: diff --git a/samples/sensor/bme280/README.rst b/samples/sensor/bme280/README.rst index 032b4614590..0cd1f6d6449 100644 --- a/samples/sensor/bme280/README.rst +++ b/samples/sensor/bme280/README.rst @@ -21,7 +21,7 @@ at page 38. .. zephyr-app-commands:: :zephyr-app: samples/sensor/bme280 - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: flash :compact: diff --git a/samples/sensor/bme280/nrf52840_pca10056.overlay b/samples/sensor/bme280/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/sensor/bme280/nrf52840_pca10056.overlay rename to samples/sensor/bme280/nrf52840dk_nrf52840.overlay diff --git a/samples/sensor/bme280/sample.yaml b/samples/sensor/bme280/sample.yaml index d5788d898e1..ddc535dfe2f 100644 --- a/samples/sensor/bme280/sample.yaml +++ b/samples/sensor/bme280/sample.yaml @@ -4,7 +4,7 @@ tests: sample.sensor.bme280: harness: console tags: sensors - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 harness_config: type: one_line regex: diff --git a/samples/sensor/bme680/README.rst b/samples/sensor/bme680/README.rst index d190001ee51..c070cf64f4c 100644 --- a/samples/sensor/bme680/README.rst +++ b/samples/sensor/bme680/README.rst @@ -30,12 +30,12 @@ Building and Running This project outputs sensor data to the console. It requires a BME680 sensor. It should work with any platform featuring a I2C peripheral interface. It does not work on QEMU. -In this example below the :ref:`nrf52840_pca10056` board is used. +In this example below the :ref:`nrf52840dk_nrf52840` board is used. .. zephyr-app-commands:: :zephyr-app: samples/sensor/bme680 - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build flash Sample Output diff --git a/samples/sensor/bme680/nrf52840_pca10056.overlay b/samples/sensor/bme680/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/sensor/bme680/nrf52840_pca10056.overlay rename to samples/sensor/bme680/nrf52840dk_nrf52840.overlay diff --git a/samples/sensor/bme680/sample.yaml b/samples/sensor/bme680/sample.yaml index b35d0986f58..1ef4861c501 100644 --- a/samples/sensor/bme680/sample.yaml +++ b/samples/sensor/bme680/sample.yaml @@ -4,4 +4,4 @@ tests: sample.sensor.bme680: harness: sensor tags: samples sensor - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 diff --git a/samples/sensor/bmm150/README.rst b/samples/sensor/bmm150/README.rst index 873709985c1..0d45d817af3 100644 --- a/samples/sensor/bmm150/README.rst +++ b/samples/sensor/bmm150/README.rst @@ -22,7 +22,7 @@ Sensor has multiple pins so you need to connect according to connection diagram .. zephyr-app-commands:: :zephyr-app: samples/sensor/bmm150 - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: flash :compact: diff --git a/samples/sensor/lsm6dsl/README.rst b/samples/sensor/lsm6dsl/README.rst index 5c2fafc4401..fb4d4d20bc8 100644 --- a/samples/sensor/lsm6dsl/README.rst +++ b/samples/sensor/lsm6dsl/README.rst @@ -48,13 +48,13 @@ Building on disco_l475_iot1 board :goals: build :compact: -Building on nrf52840_pca10056 board with x-nucleo-iks01a2 shield -================================================================ +Building on nrf52840dk_nrf52840 board with x-nucleo-iks01a2 shield +================================================================== .. zephyr-app-commands:: :zephyr-app: samples/sensor/lsm6dsl :host-os: unix - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :shield: x_nucleo_iks01a2 :goals: build :compact: diff --git a/samples/sensor/ms5837/README.rst b/samples/sensor/ms5837/README.rst index 580dee16dc5..03bf40dc188 100644 --- a/samples/sensor/ms5837/README.rst +++ b/samples/sensor/ms5837/README.rst @@ -37,11 +37,11 @@ Build this sample using the following commands: .. zephyr-app-commands:: :zephyr-app: samples/sensor/ms5837 - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build :compact: -See :ref:`nrf52840_pca10056` on how to flash the build. +See :ref:`nrf52840dk_nrf52840` on how to flash the build. References ********** diff --git a/samples/sensor/ms5837/nrf52840_pca10056.overlay b/samples/sensor/ms5837/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/sensor/ms5837/nrf52840_pca10056.overlay rename to samples/sensor/ms5837/nrf52840dk_nrf52840.overlay diff --git a/samples/sensor/ms5837/sample.yaml b/samples/sensor/ms5837/sample.yaml index 2c394f2d25f..228909d5ab4 100644 --- a/samples/sensor/ms5837/sample.yaml +++ b/samples/sensor/ms5837/sample.yaml @@ -4,5 +4,5 @@ sample: tests: sample.sensor.ms5837: build_only: true - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 tags: sensors diff --git a/samples/sensor/sht3xd/nrf52840_pca10056.overlay b/samples/sensor/sht3xd/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/sensor/sht3xd/nrf52840_pca10056.overlay rename to samples/sensor/sht3xd/nrf52840dk_nrf52840.overlay diff --git a/samples/sensor/sht3xd/sample.yaml b/samples/sensor/sht3xd/sample.yaml index 441531a2d3e..3885d77d535 100644 --- a/samples/sensor/sht3xd/sample.yaml +++ b/samples/sensor/sht3xd/sample.yaml @@ -10,11 +10,11 @@ tests: sample.sensor.sht3xd: build_only: true platform_whitelist: efr32mg_sltb004a frdm_k64f nrf51_ble400 - nrf52840_pca10056 nucleo_l476rg + nrf52840dk_nrf52840 nucleo_l476rg tags: sensors sample.sensor.sht3xd.trigger: build_only: true extra_args: CONF_FILE="trigger.conf" platform_whitelist: efr32mg_sltb004a frdm_k64f nrf51_ble400 - nrf52840_pca10056 nucleo_l476rg + nrf52840dk_nrf52840 nucleo_l476rg tags: sensors diff --git a/samples/subsys/fs/littlefs/README.rst b/samples/subsys/fs/littlefs/README.rst index 9e79263e413..ff5c098c91c 100644 --- a/samples/subsys/fs/littlefs/README.rst +++ b/samples/subsys/fs/littlefs/README.rst @@ -52,7 +52,7 @@ On this device the file system will be placed in the SOC flash. .. zephyr-app-commands:: :zephyr-app: samples/subsys/fs/littlefs - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build :compact: diff --git a/samples/subsys/fs/littlefs/boards/nrf52840_pca10056.conf b/samples/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from samples/subsys/fs/littlefs/boards/nrf52840_pca10056.conf rename to samples/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.conf diff --git a/samples/subsys/fs/littlefs/boards/nrf52840_pca10056.overlay b/samples/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from samples/subsys/fs/littlefs/boards/nrf52840_pca10056.overlay rename to samples/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.overlay diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml index 5615efc08bf..a392c1fb9b7 100644 --- a/samples/subsys/fs/littlefs/sample.yaml +++ b/samples/subsys/fs/littlefs/sample.yaml @@ -3,5 +3,5 @@ sample: tests: sample.filesystem.littlefs: build_only: true - platform_whitelist: nrf52840_pca10056 particle_xenon + platform_whitelist: nrf52840dk_nrf52840 particle_xenon tags: filesystem diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml index 2dc9a3c3a60..8df37904cce 100644 --- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml +++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml @@ -9,4 +9,4 @@ tests: extra_args: CONF_FILE="prj_tiny.conf" platform_whitelist: nrf51dk_nrf51422 sample.mcumg.smp_svr.nrf52: - platform_whitelist: nrf52_pca10040 nrf52840_pca10056 + platform_whitelist: nrf52_pca10040 nrf52840dk_nrf52840 diff --git a/samples/subsys/power/device_pm/sample.yaml b/samples/subsys/power/device_pm/sample.yaml index ec8440cb6c4..e11a31b16c4 100644 --- a/samples/subsys/power/device_pm/sample.yaml +++ b/samples/subsys/power/device_pm/sample.yaml @@ -2,7 +2,7 @@ sample: name: Device Idle Power Management tests: sample.power.ospm.dev_idle_pm: - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 tags: power harness: console harness_config: diff --git a/samples/subsys/settings/README.rst b/samples/subsys/settings/README.rst index c7bd6732d9b..c8334fa8d22 100644 --- a/samples/subsys/settings/README.rst +++ b/samples/subsys/settings/README.rst @@ -15,7 +15,7 @@ register them. Requirements ************ -* A board with settings support, for instance: nrf52840_pca10056 +* A board with settings support, for instance: nrf52840dk_nrf52840 * Or qemu_x86 target Building and Running diff --git a/samples/subsys/settings/boards/nrf52840_pca10056.conf b/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from samples/subsys/settings/boards/nrf52840_pca10056.conf rename to samples/subsys/settings/boards/nrf52840dk_nrf52840.conf diff --git a/samples/subsys/shell/fs/CMakeLists.txt b/samples/subsys/shell/fs/CMakeLists.txt index 83da2689839..c7f512dcfd9 100644 --- a/samples/subsys/shell/fs/CMakeLists.txt +++ b/samples/subsys/shell/fs/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13.1) -if((BOARD STREQUAL nrf52840_pca10056) OR +if((BOARD STREQUAL nrf52840dk_nrf52840) OR (BOARD STREQUAL nrf52_pca10040) OR (BOARD STREQUAL nrf9160_pca10090) OR (BOARD STREQUAL reel_board) diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml index cbec6660034..aeeda03d641 100644 --- a/samples/subsys/usb/dfu/sample.yaml +++ b/samples/subsys/usb/dfu/sample.yaml @@ -3,6 +3,6 @@ sample: tests: sample.usb.dfu: build_only: True - platform_whitelist: nrf52840_pca10056 intel_s1000_crb + platform_whitelist: nrf52840dk_nrf52840 intel_s1000_crb depends_on: usb_device tags: usb diff --git a/samples/subsys/usb/hid-cdc/README.rst b/samples/subsys/usb/hid-cdc/README.rst index 2e2b029e65a..b39e643916b 100644 --- a/samples/subsys/usb/hid-cdc/README.rst +++ b/samples/subsys/usb/hid-cdc/README.rst @@ -20,11 +20,11 @@ Building and Running ******************** This sample can be built for multiple boards, in this example we will build it -for the nrf52840_pca10056 board: +for the nrf52840dk_nrf52840 board: .. zephyr-app-commands:: :zephyr-app: samples/subsys/usb/hid-cdc - :board: nrf52840_pca10056 + :board: nrf52840dk_nrf52840 :goals: build :compact: diff --git a/samples/subsys/usb/hid-cdc/sample.yaml b/samples/subsys/usb/hid-cdc/sample.yaml index ff735fb241e..3e3556b2150 100644 --- a/samples/subsys/usb/hid-cdc/sample.yaml +++ b/samples/subsys/usb/hid-cdc/sample.yaml @@ -3,6 +3,6 @@ sample: tests: sample.usb.hid-cdc: depends_on: usb_device - platform_whitelist: nrf52840_pca10056 nrf52840_pca10059 + platform_whitelist: nrf52840dk_nrf52840 nrf52840_pca10059 harness: button tags: usb diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 08347d9b258..267d9724ca2 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -976,7 +976,7 @@ config BT_CTLR_PROFILE_ISR config BT_CTLR_DEBUG_PINS bool "Bluetooth Controller Debug Pins" - depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52_PCA10040 || BOARD_NRF52810_PCA10040 || BOARD_NRF52840_PCA10056 || BOARD_RV32M1_VEGA + depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52_PCA10040 || 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 8b5408deb50..5ee4c783315 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h @@ -6,7 +6,7 @@ */ #ifdef CONFIG_BT_CTLR_DEBUG_PINS -#if defined(CONFIG_BOARD_NRF52840_PCA10056) +#if defined(CONFIG_BOARD_NRF52840DK_NRF52840) #define DEBUG_PORT NRF_P1 #define DEBUG_PIN0 BIT(1) #define DEBUG_PIN1 BIT(2) diff --git a/tests/benchmarks/mbedtls/testcase.yaml b/tests/benchmarks/mbedtls/testcase.yaml index 42272032663..33846fe486f 100644 --- a/tests/benchmarks/mbedtls/testcase.yaml +++ b/tests/benchmarks/mbedtls/testcase.yaml @@ -3,4 +3,4 @@ common: tags: crypto tests: benchmark.crypto.mbedtls: - platform_whitelist: qemu_x86 frdm_k64f sam_e70_xplained nrf52840_pca10056 + platform_whitelist: qemu_x86 frdm_k64f sam_e70_xplained nrf52840dk_nrf52840 diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml index c95319a5984..98831bd715e 100644 --- a/tests/bluetooth/init/testcase.yaml +++ b/tests/bluetooth/init/testcase.yaml @@ -75,35 +75,35 @@ tests: platform_whitelist: qemu_cortex_m3 bluetooth.init.test_controller: extra_args: CONF_FILE=prj_controller.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 96b_nitrogen bluetooth.init.test_controller_4_0: extra_args: CONF_FILE=prj_controller_4_0.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 bluetooth.init.test_controller_tiny: extra_args: CONF_FILE=prj_controller_tiny.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 bluetooth.init.test_controller_dbg: extra_args: CONF_FILE=prj_controller_dbg.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 96b_nitrogen bluetooth.init.test_controller_ll_sw_split: extra_args: CONF_FILE=prj_controller_ll_sw_split.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 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: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 bluetooth.init.test_controller_tiny_ll_sw_split: extra_args: CONF_FILE=prj_controller_tiny_ll_sw_split.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 bluetooth.init.test_controller_dbg_ll_sw_split: extra_args: CONF_FILE=prj_controller_dbg_ll_sw_split.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 bluetooth.init.test_h5: extra_args: CONF_FILE=prj_h5.conf diff --git a/tests/bluetooth/mesh/testcase.yaml b/tests/bluetooth/mesh/testcase.yaml index ad3db3fb2df..a207dea117c 100644 --- a/tests/bluetooth/mesh/testcase.yaml +++ b/tests/bluetooth/mesh/testcase.yaml @@ -1,27 +1,27 @@ tests: bluetooth.mesh.main: build_only: true - platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840dk_nrf52840 tags: bluetooth mesh bluetooth.mesh.dbg: build_only: true extra_args: CONF_FILE=dbg.conf - platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840dk_nrf52840 tags: bluetooth mesh bluetooth.mesh.friend: build_only: true extra_args: CONF_FILE=friend.conf - platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840dk_nrf52840 tags: bluetooth mesh bluetooth.mesh.gatt: build_only: true extra_args: CONF_FILE=gatt.conf - platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840dk_nrf52840 tags: bluetooth mesh bluetooth.mesh.lpn: build_only: true extra_args: CONF_FILE=lpn.conf - platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840dk_nrf52840 tags: bluetooth mesh bluetooth.mesh.main.microbit: build_only: true @@ -31,10 +31,10 @@ tests: bluetooth.mesh.pb_gatt: build_only: true extra_args: CONF_FILE=pb_gatt.conf - platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840dk_nrf52840 tags: bluetooth mesh bluetooth.mesh.proxy: build_only: true extra_args: CONF_FILE=proxy.conf - platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840dk_nrf52840 tags: bluetooth mesh diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml index c726d6a0c0a..83e1d896130 100644 --- a/tests/bluetooth/shell/testcase.yaml +++ b/tests/bluetooth/shell/testcase.yaml @@ -2,7 +2,7 @@ tests: bluetooth.shell.main: extra_configs: - CONFIG_NATIVE_UART_0_ON_STDINOUT=y - platform_whitelist: qemu_cortex_m3 qemu_x86 native_posix native_posix_64 nrf52840_pca10056 + platform_whitelist: qemu_cortex_m3 qemu_x86 native_posix native_posix_64 nrf52840dk_nrf52840 platform_exclude: nrf52810_pca10040 tags: bluetooth harness: keyboard diff --git a/tests/bluetooth/tester/boards/nrf52840_pca10056.conf b/tests/bluetooth/tester/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/bluetooth/tester/boards/nrf52840_pca10056.conf rename to tests/bluetooth/tester/boards/nrf52840dk_nrf52840.conf diff --git a/tests/bluetooth/tester/nrf52840_pca10056.overlay b/tests/bluetooth/tester/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/bluetooth/tester/nrf52840_pca10056.overlay rename to tests/bluetooth/tester/nrf52840dk_nrf52840.overlay diff --git a/tests/boards/board_shell/testcase.yaml b/tests/boards/board_shell/testcase.yaml index a60fd7b922e..7b2365baae6 100644 --- a/tests/boards/board_shell/testcase.yaml +++ b/tests/boards/board_shell/testcase.yaml @@ -2,4 +2,4 @@ tests: boards.shell.shell: tags: shell harness: keyboard - platform_whitelist: nrf52840_pca10056 frdm_k64f + platform_whitelist: nrf52840dk_nrf52840 frdm_k64f diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c index 4312d193ec6..03e7c346f46 100644 --- a/tests/drivers/adc/adc_api/src/test_adc.c +++ b/tests/drivers/adc/adc_api/src/test_adc.c @@ -31,7 +31,7 @@ #define ADC_2ND_CHANNEL_INPUT NRF_ADC_CONFIG_INPUT_3 #elif defined(CONFIG_BOARD_NRF52_PCA10040) || \ - defined(CONFIG_BOARD_NRF52840_PCA10056) || \ + defined(CONFIG_BOARD_NRF52840DK_NRF52840) || \ defined(CONFIG_BOARD_NRF52840_BLIP) || \ defined(CONFIG_BOARD_NRF52840_PAPYR) || \ defined(CONFIG_BOARD_NRF52833_PCA10100) || \ diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml index 1bf7d06d223..641f12fac5e 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 nrf52840_pca10056 + platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840dk_nrf52840 nrf9160_pca10090 drivers.clock.clock_control_nrf5_lfclk_rc: tags: drivers - platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840_pca10056 + platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 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 95539b505f5..6fb18d7d675 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 nrf52840_pca10056 + platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840dk_nrf52840 diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf52840_pca10056.conf b/tests/drivers/counter/counter_basic_api/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/nrf52840_pca10056.conf rename to tests/drivers/counter/counter_basic_api/boards/nrf52840dk_nrf52840.conf diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf52840_pca10056.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf52840dk_nrf52840.overlay similarity index 99% rename from tests/drivers/counter/counter_basic_api/boards/nrf52840_pca10056.overlay rename to tests/drivers/counter/counter_basic_api/boards/nrf52840dk_nrf52840.overlay index ba555e0f823..a795afb4b17 100644 --- a/tests/drivers/counter/counter_basic_api/boards/nrf52840_pca10056.overlay +++ b/tests/drivers/counter/counter_basic_api/boards/nrf52840dk_nrf52840.overlay @@ -21,4 +21,3 @@ &rtc0 { ppi-wrap; }; - diff --git a/tests/drivers/counter/counter_nrf_rtc/fixed_top/boards/nrf52840_pca10056.conf b/tests/drivers/counter/counter_nrf_rtc/fixed_top/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/drivers/counter/counter_nrf_rtc/fixed_top/boards/nrf52840_pca10056.conf rename to tests/drivers/counter/counter_nrf_rtc/fixed_top/boards/nrf52840dk_nrf52840.conf diff --git a/tests/drivers/counter/counter_nrf_rtc/fixed_top/nrf52840_pca10056.overlay b/tests/drivers/counter/counter_nrf_rtc/fixed_top/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/drivers/counter/counter_nrf_rtc/fixed_top/nrf52840_pca10056.overlay rename to tests/drivers/counter/counter_nrf_rtc/fixed_top/nrf52840dk_nrf52840.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf52840_pca10056.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/nrf52840_pca10056.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/nrf52840dk_nrf52840.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52840_pca10056.conf b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/nrf52840_pca10056.conf rename to tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.conf diff --git a/tests/drivers/uart/uart_async_api/boards/nrf52840_pca10056.conf b/tests/drivers/uart/uart_async_api/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/nrf52840_pca10056.conf rename to tests/drivers/uart/uart_async_api/boards/nrf52840dk_nrf52840.conf diff --git a/tests/drivers/uart/uart_async_api/boards/nrf52840_pca10056.overlay b/tests/drivers/uart/uart_async_api/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/nrf52840_pca10056.overlay rename to tests/drivers/uart/uart_async_api/boards/nrf52840dk_nrf52840.overlay diff --git a/tests/drivers/uart/uart_async_api/src/test_uart.h b/tests/drivers/uart/uart_async_api/src/test_uart.h index cdcab8910d8..53c16ee197c 100644 --- a/tests/drivers/uart/uart_async_api/src/test_uart.h +++ b/tests/drivers/uart/uart_async_api/src/test_uart.h @@ -19,7 +19,7 @@ /* RX and TX pins have to be connected together*/ -#if defined(CONFIG_BOARD_NRF52840_PCA10056) +#if defined(CONFIG_BOARD_NRF52840DK_NRF52840) #define UART_DEVICE_NAME DT_UART_0_NAME #elif defined(CONFIG_BOARD_NRF9160_PCA10090) #define UART_DEVICE_NAME DT_UART_1_NAME diff --git a/tests/subsys/dfu/img_util/testcase.yaml b/tests/subsys/dfu/img_util/testcase.yaml index e113078ab2e..cf692a13d12 100644 --- a/tests/subsys/dfu/img_util/testcase.yaml +++ b/tests/subsys/dfu/img_util/testcase.yaml @@ -1,8 +1,8 @@ tests: dfu.image_util: - platform_whitelist: nrf52840_pca10056 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 native_posix native_posix_64 tags: dfu_image_util dfu.image_util.progressive: extra_args: OVERLAY_CONFIG=progressively_overlay.conf - platform_whitelist: nrf52840_pca10056 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 native_posix native_posix_64 tags: dfu_image_util diff --git a/tests/subsys/dfu/mcuboot/nrf52840_pca10056.overlay b/tests/subsys/dfu/mcuboot/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/dfu/mcuboot/nrf52840_pca10056.overlay rename to tests/subsys/dfu/mcuboot/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/dfu/mcuboot/testcase.yaml b/tests/subsys/dfu/mcuboot/testcase.yaml index 22a323855f7..ef35e7cc87a 100644 --- a/tests/subsys/dfu/mcuboot/testcase.yaml +++ b/tests/subsys/dfu/mcuboot/testcase.yaml @@ -1,4 +1,4 @@ tests: dfu.mcuboot: - platform_whitelist: nrf52840_pca10056 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 native_posix native_posix_64 tags: dfu_mcuboot diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml index 7bcaf7a815e..ae987616bfd 100644 --- a/tests/subsys/fs/fcb/testcase.yaml +++ b/tests/subsys/fs/fcb/testcase.yaml @@ -1,5 +1,5 @@ tests: filesystem.fcb: - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 nrf51dk_nrf51422 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 nrf51dk_nrf51422 native_posix native_posix_64 tags: flash_circural_buffer diff --git a/tests/subsys/fs/littlefs/boards/nrf52840_pca10056.conf b/tests/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/subsys/fs/littlefs/boards/nrf52840_pca10056.conf rename to tests/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.conf diff --git a/tests/subsys/fs/littlefs/boards/nrf52840_pca10056.overlay b/tests/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/fs/littlefs/boards/nrf52840_pca10056.overlay rename to tests/subsys/fs/littlefs/boards/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/fs/littlefs/testcase.yaml b/tests/subsys/fs/littlefs/testcase.yaml index 7dd641a2bd7..4dd40ee8eb1 100644 --- a/tests/subsys/fs/littlefs/testcase.yaml +++ b/tests/subsys/fs/littlefs/testcase.yaml @@ -1,4 +1,4 @@ tests: filesystem.littlefs: - platform_whitelist: nrf52840_pca10056 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 native_posix native_posix_64 tags: filesystem diff --git a/tests/subsys/settings/fcb/base64/nrf52840_pca10056.overlay b/tests/subsys/settings/fcb/base64/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/settings/fcb/base64/nrf52840_pca10056.overlay rename to tests/subsys/settings/fcb/base64/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/settings/fcb/base64/testcase.yaml b/tests/subsys/settings/fcb/base64/testcase.yaml index 31252c463a8..b7caf85e50a 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: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 native_posix native_posix_64 tags: settings_fcb diff --git a/tests/subsys/settings/fcb/raw/nrf52840_pca10056.overlay b/tests/subsys/settings/fcb/raw/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/settings/fcb/raw/nrf52840_pca10056.overlay rename to tests/subsys/settings/fcb/raw/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/settings/fcb/raw/testcase.yaml b/tests/subsys/settings/fcb/raw/testcase.yaml index 77660cf24a3..bcd6a457a97 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: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 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 a466123fc9b..eb39fb7e581 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: nrf52840_pca10056 nrf52_pca10040 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 tags: settings_intialization_fcb diff --git a/tests/subsys/settings/functional/fcb/boards/nrf52840_pca10056.overlay b/tests/subsys/settings/functional/fcb/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/settings/functional/fcb/boards/nrf52840_pca10056.overlay rename to tests/subsys/settings/functional/fcb/boards/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/settings/functional/fcb/testcase.yaml b/tests/subsys/settings/functional/fcb/testcase.yaml index 826c3e50ad1..07d746ddd85 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: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 native_posix native_posix_64 tags: settings_fcb diff --git a/tests/subsys/settings/functional/file/nrf52840_pca10056.overlay b/tests/subsys/settings/functional/file/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/settings/functional/file/nrf52840_pca10056.overlay rename to tests/subsys/settings/functional/file/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/settings/functional/file/testcase.yaml b/tests/subsys/settings/functional/file/testcase.yaml index f5442c57638..ce67161d245 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: nrf52840_pca10056 nrf52_pca10040 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 native_posix native_posix_64 tags: settings_file diff --git a/tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.conf b/tests/subsys/settings/littlefs/base64/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.conf rename to tests/subsys/settings/littlefs/base64/boards/nrf52840dk_nrf52840.conf diff --git a/tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.overlay b/tests/subsys/settings/littlefs/base64/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/settings/littlefs/base64/boards/nrf52840_pca10056.overlay rename to tests/subsys/settings/littlefs/base64/boards/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/settings/littlefs/base64/testcase.yaml b/tests/subsys/settings/littlefs/base64/testcase.yaml index 2b11e77cd07..ffdb3025d92 100644 --- a/tests/subsys/settings/littlefs/base64/testcase.yaml +++ b/tests/subsys/settings/littlefs/base64/testcase.yaml @@ -3,5 +3,5 @@ tests: system.settings.littlefs.base64: - platform_whitelist: nrf52840_pca10056 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 native_posix native_posix_64 tags: settings_fs filesystem diff --git a/tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.conf b/tests/subsys/settings/littlefs/raw/boards/nrf52840dk_nrf52840.conf similarity index 100% rename from tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.conf rename to tests/subsys/settings/littlefs/raw/boards/nrf52840dk_nrf52840.conf diff --git a/tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.overlay b/tests/subsys/settings/littlefs/raw/boards/nrf52840dk_nrf52840.overlay similarity index 100% rename from tests/subsys/settings/littlefs/raw/boards/nrf52840_pca10056.overlay rename to tests/subsys/settings/littlefs/raw/boards/nrf52840dk_nrf52840.overlay diff --git a/tests/subsys/settings/littlefs/raw/testcase.yaml b/tests/subsys/settings/littlefs/raw/testcase.yaml index a8c8deaf2e3..498597f096d 100644 --- a/tests/subsys/settings/littlefs/raw/testcase.yaml +++ b/tests/subsys/settings/littlefs/raw/testcase.yaml @@ -3,5 +3,5 @@ tests: system.settings.littlefs.raw: - platform_whitelist: nrf52840_pca10056 native_posix native_posix_64 + platform_whitelist: nrf52840dk_nrf52840 native_posix native_posix_64 tags: settings_fs settings_littlefs diff --git a/tests/subsys/storage/flash_map/testcase.yaml b/tests/subsys/storage/flash_map/testcase.yaml index c919c0e38f2..ea4f675cb99 100644 --- a/tests/subsys/storage/flash_map/testcase.yaml +++ b/tests/subsys/storage/flash_map/testcase.yaml @@ -4,6 +4,6 @@ tests: tags: flash_map storage.flash_map.mpu: extra_args: OVERLAY_CONFIG=overlay-mpu.conf - platform_whitelist: nrf52840_pca10056 nrf52_pca10040 frdm_k64f hexiwear_k64 + platform_whitelist: nrf52840dk_nrf52840 nrf52_pca10040 frdm_k64f hexiwear_k64 twr_ke18f tags: flash_map diff --git a/tests/subsys/tracing/testcase.yaml b/tests/subsys/tracing/testcase.yaml index 885e5236e69..8cfc49822de 100644 --- a/tests/subsys/tracing/testcase.yaml +++ b/tests/subsys/tracing/testcase.yaml @@ -8,12 +8,12 @@ common: - "thread_b: Hello World from (.*)!" tests: tracing.backends.sysview: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_configs: - CONFIG_SEGGER_SYSTEMVIEW=y - CONFIG_USE_SEGGER_RTT=y tracing.backends.cpu_stats: - platform_whitelist: nrf52840_pca10056 + platform_whitelist: nrf52840dk_nrf52840 extra_configs: - CONFIG_TRACING_CPU_STATS=y tracing.backends.openocd: