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 <Ioannis.Glaropoulos@nordicsemi.no>

boards/arm/nrf9160_pca10090/Kconfig.board

@@ -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

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

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

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

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
 **********

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 <nordic/nrf9160_sica.dtsi>
-#include "nrf9160_pca10090_common.dts"
+#include "nrf9160dk_nrf9160_common.dts"
 
 / {
 	chosen {

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:

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"

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

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.

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 <nordic/nrf9160ns_sica.dtsi>
-#include "nrf9160_pca10090_common.dts"
+#include "nrf9160dk_nrf9160_common.dts"
 
 / {
 	chosen {

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:

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

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:
 

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

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

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:

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)

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

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