From f3807f19dca84fae6d8d911d5abcf45799774cb8 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Fri, 13 Mar 2020 16:28:48 +0100 Subject: [PATCH] boards: arm: nrf51_pca10028: rename board to nrf51dk_nrf51422 We rename the nRF51 Dev Kit board target (nrf51_pca10028) to nrf51dk_nrf51422. We update all associated references in the supportive documentation and all nRF51-related cofigurations and overlay files in the samples and tests in the tree. Signed-off-by: Ioannis Glaropoulos --- .../Kconfig.board | 6 ++--- .../Kconfig.defconfig | 8 +++---- .../board.cmake | 0 .../doc/img/nrf51dk_nrf51422.jpg} | Bin .../doc/index.rst | 22 +++++++++--------- .../nrf51dk_nrf51422.dts} | 4 ++-- .../nrf51dk_nrf51422.yaml} | 4 ++-- .../nrf51dk_nrf51422_defconfig} | 2 +- cmake/boards.cmake | 2 +- doc/conf.py | 3 ++- samples/basic/minimal/sample.yaml | 10 ++++---- samples/bluetooth/hci_pwr_ctrl/sample.yaml | 2 +- ...51_pca10028.conf => nrf51dk_nrf51422.conf} | 0 ...10028.overlay => nrf51dk_nrf51422.overlay} | 0 samples/bluetooth/hci_spi/sample.yaml | 2 +- ...51_pca10028.conf => nrf51dk_nrf51422.conf} | 0 ...10028.overlay => nrf51dk_nrf51422.overlay} | 0 samples/bluetooth/hci_uart/sample.yaml | 4 ++-- samples/boards/nrf/system_off/sample.yaml | 2 +- samples/drivers/counter/alarm/sample.yaml | 2 +- samples/drivers/led_ws2812/README.rst | 2 +- ...51_pca10028.conf => nrf51dk_nrf51422.conf} | 0 ...10028.overlay => nrf51dk_nrf51422.overlay} | 0 samples/drivers/led_ws2812/sample.yaml | 2 +- .../subsys/mgmt/mcumgr/smp_svr/sample.yaml | 2 +- samples/subsys/nvs/README.rst | 4 ++-- scripts/sanity_chk/sanity_compare.args | 2 +- subsys/bluetooth/controller/Kconfig | 2 +- .../controller/ll_sw/nordic/hal/nrf5/debug.h | 2 +- tests/bluetooth/init/testcase.yaml | 16 ++++++------- tests/bluetooth/mesh/testcase.yaml | 14 +++++------ tests/bluetooth/mesh_shell/testcase.yaml | 2 +- ...51_pca10028.conf => nrf51dk_nrf51422.conf} | 0 tests/drivers/adc/adc_api/src/test_adc.c | 2 +- .../clock_control_api/testcase.yaml | 4 ++-- .../nrf_clock_calibration/testcase.yaml | 2 +- ...51_pca10028.conf => nrf51dk_nrf51422.conf} | 0 ...10028.overlay => nrf51dk_nrf51422.overlay} | 0 ...51_pca10028.conf => nrf51dk_nrf51422.conf} | 0 tests/misc/test_build/testcase.yaml | 2 +- tests/subsys/fs/fcb/testcase.yaml | 2 +- tests/subsys/storage/flash_map/testcase.yaml | 2 +- 42 files changed, 68 insertions(+), 67 deletions(-) rename boards/arm/{nrf51_pca10028 => nrf51dk_nrf51422}/Kconfig.board (52%) rename boards/arm/{nrf51_pca10028 => nrf51dk_nrf51422}/Kconfig.defconfig (66%) rename boards/arm/{nrf51_pca10028 => nrf51dk_nrf51422}/board.cmake (100%) rename boards/arm/{nrf51_pca10028/doc/img/nrf51_pca10028.jpg => nrf51dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg} (100%) rename boards/arm/{nrf51_pca10028 => nrf51dk_nrf51422}/doc/index.rst (90%) rename boards/arm/{nrf51_pca10028/nrf51_pca10028.dts => nrf51dk_nrf51422/nrf51dk_nrf51422.dts} (96%) rename boards/arm/{nrf51_pca10028/nrf51_pca10028.yaml => nrf51dk_nrf51422/nrf51dk_nrf51422.yaml} (77%) rename boards/arm/{nrf51_pca10028/nrf51_pca10028_defconfig => nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig} (88%) rename samples/bluetooth/hci_spi/boards/{nrf51_pca10028.conf => nrf51dk_nrf51422.conf} (100%) rename samples/bluetooth/hci_spi/{nrf51_pca10028.overlay => nrf51dk_nrf51422.overlay} (100%) rename samples/bluetooth/hci_uart/boards/{nrf51_pca10028.conf => nrf51dk_nrf51422.conf} (100%) rename samples/bluetooth/hci_uart/{nrf51_pca10028.overlay => nrf51dk_nrf51422.overlay} (100%) rename samples/drivers/led_ws2812/boards/{nrf51_pca10028.conf => nrf51dk_nrf51422.conf} (100%) rename samples/drivers/led_ws2812/boards/{nrf51_pca10028.overlay => nrf51dk_nrf51422.overlay} (100%) rename tests/drivers/adc/adc_api/boards/{nrf51_pca10028.conf => nrf51dk_nrf51422.conf} (100%) rename tests/drivers/counter/counter_basic_api/boards/{nrf51_pca10028.conf => nrf51dk_nrf51422.conf} (100%) rename tests/drivers/counter/counter_basic_api/boards/{nrf51_pca10028.overlay => nrf51dk_nrf51422.overlay} (100%) rename tests/drivers/spi/spi_loopback/boards/{nrf51_pca10028.conf => nrf51dk_nrf51422.conf} (100%) diff --git a/boards/arm/nrf51_pca10028/Kconfig.board b/boards/arm/nrf51dk_nrf51422/Kconfig.board similarity index 52% rename from boards/arm/nrf51_pca10028/Kconfig.board rename to boards/arm/nrf51dk_nrf51422/Kconfig.board index 9031aa4f2e5..0d93e231820 100644 --- a/boards/arm/nrf51_pca10028/Kconfig.board +++ b/boards/arm/nrf51dk_nrf51422/Kconfig.board @@ -1,8 +1,8 @@ -# nRF51 PCA10028 board configuration +# nRF51 DK NRF51422 board configuration # Copyright (c) 2016 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -config BOARD_NRF51_PCA10028 - bool "nRF51 PCA10028" +config BOARD_NRF51DK_NRF51422 + bool "nRF51 DK NRF51422" depends on SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51_pca10028/Kconfig.defconfig b/boards/arm/nrf51dk_nrf51422/Kconfig.defconfig similarity index 66% rename from boards/arm/nrf51_pca10028/Kconfig.defconfig rename to boards/arm/nrf51dk_nrf51422/Kconfig.defconfig index bf59fdea687..675a4b893ab 100644 --- a/boards/arm/nrf51_pca10028/Kconfig.defconfig +++ b/boards/arm/nrf51dk_nrf51422/Kconfig.defconfig @@ -1,12 +1,12 @@ -# nRF51 PCA10028 board configuration +# nRF51 DK NRF51422 board configuration # Copyright (c) 2016 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF51_PCA10028 +if BOARD_NRF51DK_NRF51422 config BOARD - default "nrf51_pca10028" + default "nrf51dk_nrf51422" config ADC_0 default y @@ -23,4 +23,4 @@ config SPI_1 config BT_CTLR default BT -endif # BOARD_NRF51_PCA10028 +endif # BOARD_NRF51DK_NRF51422 diff --git a/boards/arm/nrf51_pca10028/board.cmake b/boards/arm/nrf51dk_nrf51422/board.cmake similarity index 100% rename from boards/arm/nrf51_pca10028/board.cmake rename to boards/arm/nrf51dk_nrf51422/board.cmake diff --git a/boards/arm/nrf51_pca10028/doc/img/nrf51_pca10028.jpg b/boards/arm/nrf51dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg similarity index 100% rename from boards/arm/nrf51_pca10028/doc/img/nrf51_pca10028.jpg rename to boards/arm/nrf51dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg diff --git a/boards/arm/nrf51_pca10028/doc/index.rst b/boards/arm/nrf51dk_nrf51422/doc/index.rst similarity index 90% rename from boards/arm/nrf51_pca10028/doc/index.rst rename to boards/arm/nrf51dk_nrf51422/doc/index.rst index 4488e0d9576..c057d3e2b64 100644 --- a/boards/arm/nrf51_pca10028/doc/index.rst +++ b/boards/arm/nrf51dk_nrf51422/doc/index.rst @@ -1,13 +1,13 @@ -.. _nrf51_pca10028: +.. _nrf51dk_nrf51422: -nRF51-PCA10028 -############## +nRF51 DK +######## Overview ******** -The nRF51 Development Kit (PCA10028) hardware provides support for the Nordic -Semiconductor nRF51822 ARM Cortex-M0 CPU and the following devices: +The nRF51 Development Kit (nRF51 DK) hardware provides support for the Nordic +Semiconductor nRF51422 ARM Cortex-M0 CPU and the following devices: * :abbr:`ADC (Analog to Digital Converter)` * CLOCK @@ -22,12 +22,12 @@ Semiconductor nRF51822 ARM Cortex-M0 CPU and the following devices: * :abbr:`UART (Universal asynchronous receiver-transmitter)` * :abbr:`WDT (Watchdog Timer)` -.. figure:: img/nrf51_pca10028.jpg +.. figure:: img/nrf51dk_nrf51422.jpg :width: 442px :align: center - :alt: nRF51 PCA10028 DK + :alt: nRF51 DK - nRF51 PCA10028 DK (Credit: Nordic Semiconductor) + nRF51 DK (Credit: Nordic Semiconductor) More information about the board can be found at the `nRF51 DK website`_. The `Nordic Semiconductor Infocenter`_ @@ -43,7 +43,7 @@ is 16 MHz. Supported Features ================== -The nrf51_pca10028 board configuration supports the following nRF51 +The nrf51dk_nrf51422 board configuration supports the following nRF51 hardware features: +-----------+------------+----------------------+ @@ -125,7 +125,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf51_pca10028 + :board: nrf51dk_nrf51422 :goals: build flash Debugging @@ -148,7 +148,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/nrf51_pca10028/nrf51_pca10028.dts`. +:zephyr_file:`boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts`. References ********** diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028.dts b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts similarity index 96% rename from boards/arm/nrf51_pca10028/nrf51_pca10028.dts rename to boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts index a2a6c0645e8..5d04d1dc42f 100644 --- a/boards/arm/nrf51_pca10028/nrf51_pca10028.dts +++ b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts @@ -8,8 +8,8 @@ #include / { - model = "Nordic PCA10028 Dev Kit"; - compatible = "nordic,pca10028-dk", "nordic,nrf51822-qfac", + model = "Nordic nRF51 DK NRF51422"; + compatible = "nordic,nrf51-dk-nrf51422", "nordic,nrf51822-qfac", "nordic,nrf51822"; chosen { diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028.yaml b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.yaml similarity index 77% rename from boards/arm/nrf51_pca10028/nrf51_pca10028.yaml rename to boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.yaml index 4938695bf8b..999cd383773 100644 --- a/boards/arm/nrf51_pca10028/nrf51_pca10028.yaml +++ b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.yaml @@ -1,5 +1,5 @@ -identifier: nrf51_pca10028 -name: nRF51-PCA10028 +identifier: nrf51dk_nrf51422 +name: nRF51-DK-NRF51422 type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig similarity index 88% rename from boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig rename to boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig index 4f2d232bf17..94d646e446c 100644 --- a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig +++ b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAC=y -CONFIG_BOARD_NRF51_PCA10028=y +CONFIG_BOARD_NRF51DK_NRF51422=y # enable GPIO CONFIG_GPIO=y diff --git a/cmake/boards.cmake b/cmake/boards.cmake index 695cc8947a0..ce97e9cc740 100644 --- a/cmake/boards.cmake +++ b/cmake/boards.cmake @@ -34,7 +34,7 @@ function(list_boards arch list_var) ) # The above gives a list like - # nrf51_blenano/nrf51_blenano_defconfig;nrf51_pca10028/nrf51_pca10028_defconfig + # nrf51_blenano/nrf51_blenano_defconfig;nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig # we construct a list of board names by removing both the _defconfig # suffix and the path. foreach(defconfig_path ${defconfigs_for_${arch}}) diff --git a/doc/conf.py b/doc/conf.py index fab723a926e..096f2e0c470 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -337,7 +337,8 @@ html_redirect_pages = [ ('boards/arm/msp_exp432p401r_launchxl/doc/msp_exp432p401r_launchxl', 'boards/arm/msp_exp432p401r_launchxl/doc/index'), ('boards/arm/nrf51_ble400/doc/nrf51_ble400', 'boards/arm/nrf51_ble400/doc/index'), ('boards/arm/nrf51_blenano/doc/nrf51_blenano', 'boards/arm/nrf51_blenano/doc/index'), - ('boards/arm/nrf51_pca10028/doc/nrf51_pca10028', 'boards/arm/nrf51_pca10028/doc/index'), + ('boards/arm/nrf51_pca10028/doc/nrf51_pca10028', 'boards/arm/nrf51dk_nrf51422/doc/index'), + ('boards/arm/nrf51_pca10028/doc/nrf51_pca10028/index', 'boards/arm/nrf51dk_nrf51422/doc/index'), ('boards/arm/nrf51_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'), diff --git a/samples/basic/minimal/sample.yaml b/samples/basic/minimal/sample.yaml index 8eeda0cf3d9..3210da62534 100644 --- a/samples/basic/minimal/sample.yaml +++ b/samples/basic/minimal/sample.yaml @@ -5,23 +5,23 @@ tests: sample.minimal.mt.arm: build_only: true extra_args: CONF_FILE='common.conf;mt.conf;arm.conf' - platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51_pca10028 nucleo_f429zi disco_l475_iot1 + platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51dk_nrf51422 nucleo_f429zi disco_l475_iot1 sample.minimal.mt-no-preempt.arm: build_only: true extra_args: CONF_FILE='common.conf;mt.conf;no-preempt.conf;arm.conf' - platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51_pca10028 nucleo_f429zi disco_l475_iot1 + platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51dk_nrf51422 nucleo_f429zi disco_l475_iot1 sample.minimal.mt-no-preempt-no-timers.arm: build_only: true extra_args: CONF_FILE='common.conf;mt.conf;no-preempt.conf;no-timers.conf;arm.conf' - platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51_pca10028 nucleo_f429zi disco_l475_iot1 + platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51dk_nrf51422 nucleo_f429zi disco_l475_iot1 sample.minimal.no-mt.arm: build_only: true extra_args: CONF_FILE='common.conf;no-mt.conf;arm.conf' - platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51_pca10028 nucleo_f429zi disco_l475_iot1 + platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51dk_nrf51422 nucleo_f429zi disco_l475_iot1 sample.minimal.no-mt-no-timers.arm: build_only: true extra_args: CONF_FILE='common.conf;no-mt.conf;no-timers.conf;arm.conf' - platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51_pca10028 nucleo_f429zi disco_l475_iot1 + platform_whitelist: reel_board frdm_k64f mps2_an385 nrf51dk_nrf51422 nucleo_f429zi disco_l475_iot1 sample.minimal.mt.x86: build_only: true extra_args: CONF_FILE='common.conf;mt.conf;x86.conf' diff --git a/samples/bluetooth/hci_pwr_ctrl/sample.yaml b/samples/bluetooth/hci_pwr_ctrl/sample.yaml index ae906546948..9beceeee533 100644 --- a/samples/bluetooth/hci_pwr_ctrl/sample.yaml +++ b/samples/bluetooth/hci_pwr_ctrl/sample.yaml @@ -3,5 +3,5 @@ sample: tests: sample.bluetooth.hci_pwr_ctrl: harness: bluetooth - platform_whitelist: bbc_microbit nrf51_pca10028 nrf52_pca10040 qemu_cortex_m3 qemu_x86 + platform_whitelist: bbc_microbit nrf51dk_nrf51422 nrf52_pca10040 qemu_cortex_m3 qemu_x86 tags: bluetooth diff --git a/samples/bluetooth/hci_spi/boards/nrf51_pca10028.conf b/samples/bluetooth/hci_spi/boards/nrf51dk_nrf51422.conf similarity index 100% rename from samples/bluetooth/hci_spi/boards/nrf51_pca10028.conf rename to samples/bluetooth/hci_spi/boards/nrf51dk_nrf51422.conf diff --git a/samples/bluetooth/hci_spi/nrf51_pca10028.overlay b/samples/bluetooth/hci_spi/nrf51dk_nrf51422.overlay similarity index 100% rename from samples/bluetooth/hci_spi/nrf51_pca10028.overlay rename to samples/bluetooth/hci_spi/nrf51dk_nrf51422.overlay diff --git a/samples/bluetooth/hci_spi/sample.yaml b/samples/bluetooth/hci_spi/sample.yaml index fbd2665f9f8..a5da940f2d8 100644 --- a/samples/bluetooth/hci_spi/sample.yaml +++ b/samples/bluetooth/hci_spi/sample.yaml @@ -5,6 +5,6 @@ sample: tests: sample.bluetooth.hci_spi: harness: bluetooth - platform_whitelist: 96b_carbon_nrf51 nrf51_pca10028 + platform_whitelist: 96b_carbon_nrf51 nrf51dk_nrf51422 tags: bluetooth spi depends_on: spi diff --git a/samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf b/samples/bluetooth/hci_uart/boards/nrf51dk_nrf51422.conf similarity index 100% rename from samples/bluetooth/hci_uart/boards/nrf51_pca10028.conf rename to samples/bluetooth/hci_uart/boards/nrf51dk_nrf51422.conf diff --git a/samples/bluetooth/hci_uart/nrf51_pca10028.overlay b/samples/bluetooth/hci_uart/nrf51dk_nrf51422.overlay similarity index 100% rename from samples/bluetooth/hci_uart/nrf51_pca10028.overlay rename to samples/bluetooth/hci_uart/nrf51dk_nrf51422.overlay diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml index ecb4236b6c6..22d824d0088 100644 --- a/samples/bluetooth/hci_uart/sample.yaml +++ b/samples/bluetooth/hci_uart/sample.yaml @@ -4,11 +4,11 @@ sample: tests: sample.bluetooth.hci_uart.arm: harness: bluetooth - platform_whitelist: 96b_nitrogen nrf51_pca10028 + platform_whitelist: 96b_nitrogen nrf51dk_nrf51422 nrf52_pca10040 bbc_microbit tags: uart bluetooth sample.bluetooth.hci_uart.nrf5: harness: bluetooth - platform_whitelist: 96b_nitrogen nrf51_pca10028 + platform_whitelist: 96b_nitrogen nrf51dk_nrf51422 nrf52_pca10040 tags: uart bluetooth diff --git a/samples/boards/nrf/system_off/sample.yaml b/samples/boards/nrf/system_off/sample.yaml index f9a78f91234..7b711397dd3 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 nrf51_pca10028 + platform_whitelist: nrf52840_pca10056 nrf52_pca10040 nrf51dk_nrf51422 tags: power diff --git a/samples/drivers/counter/alarm/sample.yaml b/samples/drivers/counter/alarm/sample.yaml index 1eba9b7d362..ea0aaf56271 100644 --- a/samples/drivers/counter/alarm/sample.yaml +++ b/samples/drivers/counter/alarm/sample.yaml @@ -4,7 +4,7 @@ tests: sample.drivers.counter.alarm: tags: drivers harness: console - platform_whitelist: nucleo_f746zg nrf51_pca10028 nrf52_pca10040 + platform_whitelist: nucleo_f746zg nrf51dk_nrf51422 nrf52_pca10040 nrf52840_pca10056 nrf9160_pca10090 harness_config: type: multi_line diff --git a/samples/drivers/led_ws2812/README.rst b/samples/drivers/led_ws2812/README.rst index f2e81e3c070..e5576e453e7 100644 --- a/samples/drivers/led_ws2812/README.rst +++ b/samples/drivers/led_ws2812/README.rst @@ -55,7 +55,7 @@ To make sure the sample is set up properly for building, you must: 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/nrf51_pca10028.overlay`. +:zephyr_file:`samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay`. Some boards are already supported out of the box; see the :file:`boards` directory for this sample for details. diff --git a/samples/drivers/led_ws2812/boards/nrf51_pca10028.conf b/samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.conf similarity index 100% rename from samples/drivers/led_ws2812/boards/nrf51_pca10028.conf rename to samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.conf diff --git a/samples/drivers/led_ws2812/boards/nrf51_pca10028.overlay b/samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay similarity index 100% rename from samples/drivers/led_ws2812/boards/nrf51_pca10028.overlay rename to samples/drivers/led_ws2812/boards/nrf51dk_nrf51422.overlay diff --git a/samples/drivers/led_ws2812/sample.yaml b/samples/drivers/led_ws2812/sample.yaml index c22b11ca5de..08e3ea85610 100644 --- a/samples/drivers/led_ws2812/sample.yaml +++ b/samples/drivers/led_ws2812/sample.yaml @@ -3,5 +3,5 @@ sample: name: WS2812 sample tests: sample.drivers.led.ws2812: - platform_whitelist: bbc_microbit nrf51_pca10028 nrf52_pca10040 + platform_whitelist: bbc_microbit nrf51dk_nrf51422 nrf52_pca10040 tags: LED diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml index 0bde1d80a15..2dc9a3c3a60 100644 --- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml +++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml @@ -7,6 +7,6 @@ common: tests: sample.mcumg.smp_svr.nrf51: extra_args: CONF_FILE="prj_tiny.conf" - platform_whitelist: nrf51_pca10028 + platform_whitelist: nrf51dk_nrf51422 sample.mcumg.smp_svr.nrf52: platform_whitelist: nrf52_pca10040 nrf52840_pca10056 diff --git a/samples/subsys/nvs/README.rst b/samples/subsys/nvs/README.rst index 74fda989170..1abcaad3001 100644 --- a/samples/subsys/nvs/README.rst +++ b/samples/subsys/nvs/README.rst @@ -22,11 +22,11 @@ Building and Running This sample can be found under :zephyr_file:`samples/subsys/nvs` in the Zephyr tree. The sample can be build for several platforms, the following commands build the -application for the nrf51_pca10028 board. +application for the nrf51dk_nrf51422 board. .. zephyr-app-commands:: :zephyr-app: samples/subsys/nvs - :board: nrf51_pca10028 + :board: nrf51dk_nrf51422 :goals: build flash :compact: diff --git a/scripts/sanity_chk/sanity_compare.args b/scripts/sanity_chk/sanity_compare.args index 76d73582715..754b2019da2 100644 --- a/scripts/sanity_chk/sanity_compare.args +++ b/scripts/sanity_chk/sanity_compare.args @@ -5,6 +5,6 @@ footprint -p frdm_k64f -p -nrf51_pca10028 +nrf51dk_nrf51422 -p nrf52_pca10040 diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 10420270cee..08347d9b258 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_NRF51_PCA10028 || BOARD_NRF52_PCA10040 || BOARD_NRF52810_PCA10040 || BOARD_NRF52840_PCA10056 || BOARD_RV32M1_VEGA + depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52_PCA10040 || BOARD_NRF52810_PCA10040 || BOARD_NRF52840_PCA10056 || 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 47e5884e108..8b5408deb50 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h @@ -31,7 +31,7 @@ #define DEBUG_PIN7 BIT(18) #define DEBUG_PIN8 BIT(19) #define DEBUG_PIN9 BIT(20) -#elif defined(CONFIG_BOARD_NRF51_PCA10028) +#elif defined(CONFIG_BOARD_NRF51DK_NRF51422) #define DEBUG_PORT NRF_GPIO #define DEBUG_PIN0 BIT(12) #define DEBUG_PIN1 BIT(13) diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml index d30285044de..c95319a5984 100644 --- a/tests/bluetooth/init/testcase.yaml +++ b/tests/bluetooth/init/testcase.yaml @@ -76,35 +76,35 @@ tests: bluetooth.init.test_controller: extra_args: CONF_FILE=prj_controller.conf platform_whitelist: nrf52840_pca10056 nrf52_pca10040 - nrf51_pca10028 96b_nitrogen + 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 - nrf51_pca10028 + nrf51dk_nrf51422 bluetooth.init.test_controller_tiny: extra_args: CONF_FILE=prj_controller_tiny.conf platform_whitelist: nrf52840_pca10056 nrf52_pca10040 - nrf51_pca10028 + nrf51dk_nrf51422 bluetooth.init.test_controller_dbg: extra_args: CONF_FILE=prj_controller_dbg.conf platform_whitelist: nrf52840_pca10056 nrf52_pca10040 - nrf51_pca10028 96b_nitrogen + 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 - nrf51_pca10028 + 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 - nrf51_pca10028 + 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 - nrf51_pca10028 + 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 - nrf51_pca10028 + nrf51dk_nrf51422 bluetooth.init.test_h5: extra_args: CONF_FILE=prj_h5.conf platform_whitelist: qemu_cortex_m3 diff --git a/tests/bluetooth/mesh/testcase.yaml b/tests/bluetooth/mesh/testcase.yaml index c61a0c98994..ad3db3fb2df 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 nrf51_pca10028 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 tags: bluetooth mesh bluetooth.mesh.dbg: build_only: true extra_args: CONF_FILE=dbg.conf - platform_whitelist: qemu_x86 nrf51_pca10028 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 tags: bluetooth mesh bluetooth.mesh.friend: build_only: true extra_args: CONF_FILE=friend.conf - platform_whitelist: qemu_x86 nrf51_pca10028 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 tags: bluetooth mesh bluetooth.mesh.gatt: build_only: true extra_args: CONF_FILE=gatt.conf - platform_whitelist: qemu_x86 nrf51_pca10028 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 tags: bluetooth mesh bluetooth.mesh.lpn: build_only: true extra_args: CONF_FILE=lpn.conf - platform_whitelist: qemu_x86 nrf51_pca10028 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 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 nrf51_pca10028 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 tags: bluetooth mesh bluetooth.mesh.proxy: build_only: true extra_args: CONF_FILE=proxy.conf - platform_whitelist: qemu_x86 nrf51_pca10028 nrf52840_pca10056 + platform_whitelist: qemu_x86 nrf51dk_nrf51422 nrf52840_pca10056 tags: bluetooth mesh diff --git a/tests/bluetooth/mesh_shell/testcase.yaml b/tests/bluetooth/mesh_shell/testcase.yaml index f7abd9bbb64..8e60287c467 100644 --- a/tests/bluetooth/mesh_shell/testcase.yaml +++ b/tests/bluetooth/mesh_shell/testcase.yaml @@ -1,6 +1,6 @@ tests: bluetooth.mesh.mesh_shell: - platform_whitelist: qemu_cortex_m3 qemu_x86 nrf51_pca10028 + platform_whitelist: qemu_cortex_m3 qemu_x86 nrf51dk_nrf51422 platform_exclude: nrf52810_pca10040 tags: bluetooth harness: keyboard diff --git a/tests/drivers/adc/adc_api/boards/nrf51_pca10028.conf b/tests/drivers/adc/adc_api/boards/nrf51dk_nrf51422.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/nrf51_pca10028.conf rename to tests/drivers/adc/adc_api/boards/nrf51dk_nrf51422.conf diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c index a068833e7ec..4312d193ec6 100644 --- a/tests/drivers/adc/adc_api/src/test_adc.c +++ b/tests/drivers/adc/adc_api/src/test_adc.c @@ -17,7 +17,7 @@ #include #include -#if defined(CONFIG_BOARD_NRF51_PCA10028) +#if defined(CONFIG_BOARD_NRF51DK_NRF51422) #include #define ADC_DEVICE_NAME DT_ADC_0_NAME diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml index 28cb6efafce..1bf7d06d223 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: nrf51_pca10028 nrf52_pca10040 nrf52840_pca10056 + platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840_pca10056 nrf9160_pca10090 drivers.clock.clock_control_nrf5_lfclk_rc: tags: drivers - platform_whitelist: nrf51_pca10028 nrf52_pca10040 nrf52840_pca10056 + platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840_pca10056 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 763fff47441..95539b505f5 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: nrf51_pca10028 nrf52_pca10040 nrf52840_pca10056 + platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840_pca10056 diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf51_pca10028.conf b/tests/drivers/counter/counter_basic_api/boards/nrf51dk_nrf51422.conf similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/nrf51_pca10028.conf rename to tests/drivers/counter/counter_basic_api/boards/nrf51dk_nrf51422.conf diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf51_pca10028.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf51dk_nrf51422.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/nrf51_pca10028.overlay rename to tests/drivers/counter/counter_basic_api/boards/nrf51dk_nrf51422.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/nrf51_pca10028.conf b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51422.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/nrf51_pca10028.conf rename to tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51422.conf diff --git a/tests/misc/test_build/testcase.yaml b/tests/misc/test_build/testcase.yaml index 75c0c78fb07..45e45b911e8 100644 --- a/tests/misc/test_build/testcase.yaml +++ b/tests/misc/test_build/testcase.yaml @@ -6,7 +6,7 @@ tests: bootloader.mcuboot.build: tags: mcuboot build_only: true - platform_whitelist: nrf51_pca10028 nrf52_pca10040 + platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 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 833f9a77f7b..7bcaf7a815e 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 nrf51_pca10028 + platform_whitelist: nrf52840_pca10056 nrf52_pca10040 nrf51dk_nrf51422 native_posix native_posix_64 tags: flash_circural_buffer diff --git a/tests/subsys/storage/flash_map/testcase.yaml b/tests/subsys/storage/flash_map/testcase.yaml index 5058c605f59..c919c0e38f2 100644 --- a/tests/subsys/storage/flash_map/testcase.yaml +++ b/tests/subsys/storage/flash_map/testcase.yaml @@ -1,6 +1,6 @@ tests: storage.flash_map: - platform_whitelist: nrf51_pca10028 qemu_x86 native_posix native_posix_64 + platform_whitelist: nrf51dk_nrf51422 qemu_x86 native_posix native_posix_64 tags: flash_map storage.flash_map.mpu: extra_args: OVERLAY_CONFIG=overlay-mpu.conf