From e0b8158ca1d972a1b0a7e1d11dcc48385bdbcfdf Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Thu, 26 Mar 2020 12:24:46 +0100 Subject: [PATCH] boards: arm: nrf9160_pca10090: rename board to nrf9160dk_nrf9160 We rename the nRF91 Dev Kit board target (nrf9160_pca10090) to nrf9160dk_nrf9160. We update all associated references in the supportive documentation and all nRF9160-related cofigurations and overlay files in the samples and tests in the tree. Signed-off-by: Ioannis Glaropoulos --- boards/arm/nrf9160_pca10090/Kconfig.board | 14 ------- .../CMakeLists.txt | 0 .../Kconfig | 6 +-- boards/arm/nrf9160dk_nrf9160/Kconfig.board | 14 +++++++ .../Kconfig.defconfig | 16 ++++---- .../board.cmake | 0 .../doc/img/nrf9160dk_nrf9160.png} | Bin .../doc/index.rst | 36 ++++++++++-------- .../nrf52840_reset.c | 0 .../nrf9160dk_nrf9160.dts} | 4 +- .../nrf9160dk_nrf9160.yaml} | 4 +- .../nrf9160dk_nrf9160_common.dts} | 8 ++-- .../nrf9160dk_nrf9160_defconfig} | 2 +- .../nrf9160dk_nrf9160_partition_conf.dts} | 4 +- .../nrf9160dk_nrf9160ns.dts} | 4 +- .../nrf9160dk_nrf9160ns.yaml} | 4 +- .../nrf9160dk_nrf9160ns_defconfig} | 2 +- samples/boards/nrf/nrfx/README.rst | 5 ++- samples/boards/nrf/nrfx/sample.yaml | 2 +- samples/drivers/counter/alarm/sample.yaml | 2 +- samples/drivers/soc_flash_nrf/sample.yaml | 2 +- samples/subsys/shell/fs/CMakeLists.txt | 2 +- .../clock_control_api/testcase.yaml | 2 +- ...0_pca10090.conf => nrf9160dk_nrf9160.conf} | 0 ...0090.overlay => nrf9160dk_nrf9160.overlay} | 0 .../uart/uart_async_api/src/test_uart.h | 2 +- 26 files changed, 70 insertions(+), 65 deletions(-) delete mode 100644 boards/arm/nrf9160_pca10090/Kconfig.board rename boards/arm/{nrf9160_pca10090 => nrf9160dk_nrf9160}/CMakeLists.txt (100%) rename boards/arm/{nrf9160_pca10090 => nrf9160dk_nrf9160}/Kconfig (77%) create mode 100644 boards/arm/nrf9160dk_nrf9160/Kconfig.board rename boards/arm/{nrf9160_pca10090 => nrf9160dk_nrf9160}/Kconfig.defconfig (77%) rename boards/arm/{nrf9160_pca10090 => nrf9160dk_nrf9160}/board.cmake (100%) rename boards/arm/{nrf9160_pca10090/doc/img/nrf9160_pca10090.png => nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.png} (100%) rename boards/arm/{nrf9160_pca10090 => nrf9160dk_nrf9160}/doc/index.rst (87%) rename boards/arm/{nrf9160_pca10090 => nrf9160dk_nrf9160}/nrf52840_reset.c (100%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090.dts => nrf9160dk_nrf9160/nrf9160dk_nrf9160.dts} (69%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090.yaml => nrf9160dk_nrf9160/nrf9160dk_nrf9160.yaml} (69%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090_common.dts => nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts} (93%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090_defconfig => nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig} (90%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090_partition_conf.dts => nrf9160dk_nrf9160/nrf9160dk_nrf9160_partition_conf.dts} (92%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090ns.dts => nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.dts} (70%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090ns.yaml => nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.yaml} (65%) rename boards/arm/{nrf9160_pca10090/nrf9160_pca10090ns_defconfig => nrf9160dk_nrf9160/nrf9160dk_nrf9160ns_defconfig} (92%) rename tests/drivers/uart/uart_async_api/boards/{nrf9160_pca10090.conf => nrf9160dk_nrf9160.conf} (100%) rename tests/drivers/uart/uart_async_api/boards/{nrf9160_pca10090.overlay => nrf9160dk_nrf9160.overlay} (100%) diff --git a/boards/arm/nrf9160_pca10090/Kconfig.board b/boards/arm/nrf9160_pca10090/Kconfig.board deleted file mode 100644 index 85713b098a9..00000000000 --- a/boards/arm/nrf9160_pca10090/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# nRF9160 PCA10090 board configuration - -# Copyright (c) 2018 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_NRF9160_PCA10090 - bool "nRF9160 PCA10090" - -config BOARD_NRF9160_PCA10090NS - bool "nRF9160 PCA10090 non-secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_pca10090/CMakeLists.txt b/boards/arm/nrf9160dk_nrf9160/CMakeLists.txt similarity index 100% rename from boards/arm/nrf9160_pca10090/CMakeLists.txt rename to boards/arm/nrf9160dk_nrf9160/CMakeLists.txt diff --git a/boards/arm/nrf9160_pca10090/Kconfig b/boards/arm/nrf9160dk_nrf9160/Kconfig similarity index 77% rename from boards/arm/nrf9160_pca10090/Kconfig rename to boards/arm/nrf9160dk_nrf9160/Kconfig index b5de3de41db..6cc5219eba8 100644 --- a/boards/arm/nrf9160_pca10090/Kconfig +++ b/boards/arm/nrf9160dk_nrf9160/Kconfig @@ -1,12 +1,12 @@ -# nRF9160 PCA10090 board configuration +# nRF9160 DK board configuration # Copyright (c) 2018 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 config BOARD_NRF52840_GPIO_RESET - bool "Use nRF52840 PCA10090 GPIO reset pin" + bool "Use nRF52840 GPIO reset pin" default y if BT_H4 - depends on BOARD_NRF9160_PCA10090 || BOARD_NRF9160_PCA10090NS + depends on BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160NS help Use a GPIO pin to reset the nRF52840 controller and let it wait until all bytes traveling to the H4 device have been received and drained, thus diff --git a/boards/arm/nrf9160dk_nrf9160/Kconfig.board b/boards/arm/nrf9160dk_nrf9160/Kconfig.board new file mode 100644 index 00000000000..2cb4cd4b477 --- /dev/null +++ b/boards/arm/nrf9160dk_nrf9160/Kconfig.board @@ -0,0 +1,14 @@ +# nRF9160 DK NRF9160 board configuration + +# Copyright (c) 2018-2020 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +if SOC_NRF9160_SICA + +config BOARD_NRF9160DK_NRF9160 + bool "nRF9160 DK NRF9160" + +config BOARD_NRF9160DK_NRF9160NS + bool "nRF9160 DK NRF9160 non-secure" + +endif # SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_pca10090/Kconfig.defconfig b/boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig similarity index 77% rename from boards/arm/nrf9160_pca10090/Kconfig.defconfig rename to boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig index e1571ba4e30..3a7964719d5 100644 --- a/boards/arm/nrf9160_pca10090/Kconfig.defconfig +++ b/boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig @@ -1,12 +1,12 @@ -# nRF91 PCA10090 board configuration +# nRF9160 DK NRF9160 board configuration -# Copyright (c) 2018 Nordic Semiconductor ASA +# Copyright (c) 2018-2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF9160_PCA10090 || BOARD_NRF9160_PCA10090NS +if BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160NS config BOARD - default "nrf9160_pca10090" + default "nrf9160dk_nrf9160" config ADC_0 default y @@ -39,9 +39,9 @@ DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) - depends on BOARD_NRF9160_PCA10090 && TRUSTED_EXECUTION_SECURE + depends on BOARD_NRF9160DK_NRF9160 && TRUSTED_EXECUTION_SECURE -if BOARD_NRF9160_PCA10090NS +if BOARD_NRF9160DK_NRF9160NS config FLASH_LOAD_OFFSET default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -49,6 +49,6 @@ config FLASH_LOAD_OFFSET config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) -endif # BOARD_NRF9160_PCA10090NS +endif # BOARD_NRF9160DK_NRF9160NS -endif # BOARD_NRF9160_PCA10090 || BOARD_NRF9160_PCA10090NS +endif # BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160NS diff --git a/boards/arm/nrf9160_pca10090/board.cmake b/boards/arm/nrf9160dk_nrf9160/board.cmake similarity index 100% rename from boards/arm/nrf9160_pca10090/board.cmake rename to boards/arm/nrf9160dk_nrf9160/board.cmake diff --git a/boards/arm/nrf9160_pca10090/doc/img/nrf9160_pca10090.png b/boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.png similarity index 100% rename from boards/arm/nrf9160_pca10090/doc/img/nrf9160_pca10090.png rename to boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.png diff --git a/boards/arm/nrf9160_pca10090/doc/index.rst b/boards/arm/nrf9160dk_nrf9160/doc/index.rst similarity index 87% rename from boards/arm/nrf9160_pca10090/doc/index.rst rename to boards/arm/nrf9160dk_nrf9160/doc/index.rst index c437a24fcb3..dc05cd308d1 100644 --- a/boards/arm/nrf9160_pca10090/doc/index.rst +++ b/boards/arm/nrf9160dk_nrf9160/doc/index.rst @@ -1,14 +1,14 @@ -.. _nrf9160_pca10090: +.. _nrf9160dk_nrf9160: -nRF9160-PCA10090 -################ +nRF9160 DK +########## Overview ******** -The nRF9160 PCA10090 is a single-board development kit for evaluation -and development on the nRF9160 SiP for LTE-M and NB-IoT. The -nrf9160_pca10090 board provides support for the Nordic Semiconductor +The nRF9160 Development Kit (PCA10090) is a single-board development kit +for evaluation and development on the nRF9160 SiP for LTE-M and NB-IoT. +The nrf9160dk_nrf9160 board provides support for the Nordic Semiconductor nRF9160 ARM Cortex-M33F CPU with ARMv8-M Security Extension and the following devices: @@ -27,17 +27,21 @@ following devices: * :abbr:`WDT (Watchdog Timer)` * :abbr:`IDAU (Implementation Defined Attribution Unit)` -.. figure:: img/nrf9160_pca10090.png +.. figure:: img/nrf9160dk_nrf9160.png :width: 711px :align: center - :alt: nRF9160 PCA10090 DK + :alt: nRF9160 DK - nRF9160 PCA10090 DK (Credit: Nordic Semiconductor) + nRF9160 DK (Credit: Nordic Semiconductor) More information about the board can be found at the `nRF91 DK website`_. The `Nordic Semiconductor Infocenter`_ contains the processor's information and the datasheet. +.. note:: + + In previous Zephyr releases this board was named *nrf9160_pca10090*. + Hardware ******** @@ -48,7 +52,7 @@ is 32 MHz. Supported Features ================== -The nrf9160_pca10090 board configuration supports the following +The nrf9160dk_nrf9160 board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -120,7 +124,7 @@ Security components Programming and Debugging ************************* -nrf9160_pca10090 supports the Armv8m Security Extension, and by default boots +nrf9160dk_nrf9160 supports the Armv8m Security Extension, and by default boots in the Secure state. Building Secure/Non-Secure Zephyr applications @@ -128,9 +132,9 @@ Building Secure/Non-Secure Zephyr applications The process requires the following steps: -1. Build the Secure Zephyr application using ``-DBOARD=nrf9160_pca10090`` and +1. Build the Secure Zephyr application using ``-DBOARD=nrf9160dk_nrf9160`` and ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the the application project configuration file. -2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9160_pca10090ns``. +2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9160dk_nrf9160ns``. 3. Merge the two binaries together. When building a Secure/Non-Secure application, the Secure application will @@ -142,7 +146,7 @@ Building a Secure only application ================================== Build the Zephyr app in the usual way (see :ref:`build_an_application` -and :ref:`application_run`), using ``-DBOARD=nrf9160_pca10090``. +and :ref:`application_run`), using ``-DBOARD=nrf9160dk_nrf9160``. Flashing @@ -169,7 +173,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf9160_pca10090 + :board: nrf9160dk_nrf9160 :goals: build flash Debugging @@ -190,7 +194,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/nrf9160_pca10090/nrf9160_pca10090_common.dts`. +:zephyr_file:`boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts`. References ********** diff --git a/boards/arm/nrf9160_pca10090/nrf52840_reset.c b/boards/arm/nrf9160dk_nrf9160/nrf52840_reset.c similarity index 100% rename from boards/arm/nrf9160_pca10090/nrf52840_reset.c rename to boards/arm/nrf9160dk_nrf9160/nrf52840_reset.c diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090.dts b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160.dts similarity index 69% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090.dts rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160.dts index 6613bb404eb..1cfb9572614 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090.dts +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2018 Nordic Semiconductor ASA + * Copyright (c) 2018-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ /dts-v1/; #include -#include "nrf9160_pca10090_common.dts" +#include "nrf9160dk_nrf9160_common.dts" / { chosen { diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090.yaml b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160.yaml similarity index 69% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090.yaml rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160.yaml index 9bf1e9bf242..e5f5fb3e0da 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090.yaml +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160.yaml @@ -1,5 +1,5 @@ -identifier: nrf9160_pca10090 -name: nRF9160-PCA10090 +identifier: nrf9160dk_nrf9160 +name: nRF9160-DK-NRF9160 type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_common.dts b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts similarity index 93% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090_common.dts rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts index 1fc92cf713c..0d00e7491a3 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_common.dts +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2018 Nordic Semiconductor ASA + * Copyright (c) 2018-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ / { - model = "Nordic PCA10090 Dev Kit"; - compatible = "nordic,pca10090-dk", "nordic,nrf9160-sica", + model = "Nordic nRF9160 DK NRF9160"; + compatible = "nordic,nrf9160-dk-nrf9160", "nordic,nrf9160-sica", "nordic,nrf9160"; chosen { @@ -193,4 +193,4 @@ }; /* Include partition configuration file */ -#include "nrf9160_pca10090_partition_conf.dts" +#include "nrf9160dk_nrf9160_partition_conf.dts" diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_defconfig b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig similarity index 90% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090_defconfig rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig index 972e00fc02f..aac6b964452 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_defconfig +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF91X=y CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_PCA10090=y +CONFIG_BOARD_NRF9160DK_NRF9160=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_partition_conf.dts b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_partition_conf.dts similarity index 92% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090_partition_conf.dts rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_partition_conf.dts index 5f99f384a1e..80b40bb785f 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_partition_conf.dts +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_partition_conf.dts @@ -1,11 +1,11 @@ /* - * Copyright (c) 2018 Nordic Semiconductor ASA + * Copyright (c) 2018-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ /* - * Default Flash planning for nRF9160_pca10090. + * Default Flash planning for nRF9160dk_nrf9160. * * Zephyr build for nRF9160 with ARM TrustZone-M support, * implies building Secure and Non-Secure Zephyr images. diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns.dts b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.dts similarity index 70% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090ns.dts rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.dts index 2806bc4a3e4..730614d5bfd 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns.dts +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2018 Nordic Semiconductor ASA + * Copyright (c) 2018-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ /dts-v1/; #include -#include "nrf9160_pca10090_common.dts" +#include "nrf9160dk_nrf9160_common.dts" / { chosen { diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns.yaml b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.yaml similarity index 65% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090ns.yaml rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.yaml index 065961991e3..ac967a3915c 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns.yaml +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns.yaml @@ -1,5 +1,5 @@ -identifier: nrf9160_pca10090ns -name: nRF9160-PCA10090-Non-Secure +identifier: nrf9160dk_nrf9160ns +name: nRF9160-DK-NRF9160-Non-Secure type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns_defconfig b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns_defconfig similarity index 92% rename from boards/arm/nrf9160_pca10090/nrf9160_pca10090ns_defconfig rename to boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns_defconfig index 0ff2e3a62c5..e55018e576a 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns_defconfig +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160ns_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF91X=y CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_PCA10090NS=y +CONFIG_BOARD_NRF9160DK_NRF9160NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/samples/boards/nrf/nrfx/README.rst b/samples/boards/nrf/nrfx/README.rst index 10dac32a84a..4faac6f419e 100644 --- a/samples/boards/nrf/nrfx/README.rst +++ b/samples/boards/nrf/nrfx/README.rst @@ -23,7 +23,8 @@ LED is then toggled. Requirements ************ -This sample has been tested on the NordicSemiconductor nRF9160 DK (nrf9160_pca10090) board. +This sample has been tested on the NordicSemiconductor nRF9160 DK +(nrf9160dk_nrf9160) board. Building and Running ******************** @@ -34,7 +35,7 @@ To build and flash the application: .. zephyr-app-commands:: :zephyr-app: samples/boards/nrf/nrfx - :board: nrf9160_pca10090 + :board: nrf9160dk_nrf9160 :goals: build flash :compact: diff --git a/samples/boards/nrf/nrfx/sample.yaml b/samples/boards/nrf/nrfx/sample.yaml index 66d0e60380b..7e8bf290399 100644 --- a/samples/boards/nrf/nrfx/sample.yaml +++ b/samples/boards/nrf/nrfx/sample.yaml @@ -2,5 +2,5 @@ sample: name: nrfx usage sample tests: sample.board.nrf91.nrfx: - platform_whitelist: nrf9160_pca10090 + platform_whitelist: nrf9160dk_nrf9160 tags: board diff --git a/samples/drivers/counter/alarm/sample.yaml b/samples/drivers/counter/alarm/sample.yaml index bb9ecfe0796..018cb26891a 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 - nrf52840dk_nrf52840 nrf9160_pca10090 + nrf52840dk_nrf52840 nrf9160dk_nrf9160 harness_config: type: multi_line ordered: true diff --git a/samples/drivers/soc_flash_nrf/sample.yaml b/samples/drivers/soc_flash_nrf/sample.yaml index 487958c4184..4179d6ffb62 100644 --- a/samples/drivers/soc_flash_nrf/sample.yaml +++ b/samples/drivers/soc_flash_nrf/sample.yaml @@ -2,7 +2,7 @@ sample: name: SoC Flash on NRF52 tests: sample.drivers.flash.soc_flash_nrf: - platform_whitelist: nrf52_pca10040 nrf9160_pca10090 nrf9160_pca10090ns + platform_whitelist: nrf52_pca10040 nrf9160dk_nrf9160 nrf9160dk_nrf9160ns tags: flash nrf52 nrf9160 harness: console harness_config: diff --git a/samples/subsys/shell/fs/CMakeLists.txt b/samples/subsys/shell/fs/CMakeLists.txt index 6d521115e19..ed9c1b68091 100644 --- a/samples/subsys/shell/fs/CMakeLists.txt +++ b/samples/subsys/shell/fs/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1) if((BOARD STREQUAL nrf52840dk_nrf52840) OR (BOARD STREQUAL nrf52_pca10040) OR - (BOARD STREQUAL nrf9160_pca10090) OR + (BOARD STREQUAL nrf9160dk_nrf9160) OR (BOARD STREQUAL reel_board) ) if(EXISTS ${APPLICATION_SOURCE_DIR}/boards/${BOARD}.conf) diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml index 641f12fac5e..7b1dd45b91b 100644 --- a/tests/drivers/clock_control/clock_control_api/testcase.yaml +++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml @@ -2,7 +2,7 @@ tests: drivers.clock.clock_control_nrf5: tags: drivers platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840dk_nrf52840 - nrf9160_pca10090 + nrf9160dk_nrf9160 drivers.clock.clock_control_nrf5_lfclk_rc: tags: drivers platform_whitelist: nrf51dk_nrf51422 nrf52_pca10040 nrf52840dk_nrf52840 diff --git a/tests/drivers/uart/uart_async_api/boards/nrf9160_pca10090.conf b/tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.conf similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/nrf9160_pca10090.conf rename to tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.conf diff --git a/tests/drivers/uart/uart_async_api/boards/nrf9160_pca10090.overlay b/tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/nrf9160_pca10090.overlay rename to tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.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 53c16ee197c..a55183715a7 100644 --- a/tests/drivers/uart/uart_async_api/src/test_uart.h +++ b/tests/drivers/uart/uart_async_api/src/test_uart.h @@ -21,7 +21,7 @@ #if defined(CONFIG_BOARD_NRF52840DK_NRF52840) #define UART_DEVICE_NAME DT_UART_0_NAME -#elif defined(CONFIG_BOARD_NRF9160_PCA10090) +#elif defined(CONFIG_BOARD_NRF9160DK_NRF9160) #define UART_DEVICE_NAME DT_UART_1_NAME #else #define UART_DEVICE_NAME CONFIG_UART_CONSOLE_ON_DEV_NAME