boards: nrf52840_pca10059: Rename to nrf52840dongle_nrf52840

The board name for the nRF52840 Dongle, so far known as
nrf52840_pca10059, is renamed to nrf52840dongle_nrf52840. Its
documentation and all references to its name in the tree are updated
accordingly. Overlay and configuration files specific to this board are
also renamed, to match the new board name.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>

boards/arm/nrf52840_pca10059/Kconfig.board

@@ -1,8 +0,0 @@
-# nRF52840 PCA10059 board configuration
-
-# Copyright (c) 2018 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NRF52840_PCA10059
-	bool "NRF52840 PCA10059"
-	depends on SOC_NRF52840_QIAA

boards/arm/nrf52840dongle_nrf52840/Kconfig

@@ -1,9 +1,9 @@
-# nRF52840 PCA10059 board configuration
+# nRF52840 Dongle NRF52840 board configuration
 
 # Copyright (c) 2018 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_NRF52840_PCA10059
+if BOARD_NRF52840DONGLE_NRF52840
 
 config BOARD_ENABLE_DCDC
 	bool "Enable DCDC mode"
@@ -17,4 +17,4 @@ config BOARD_HAS_NRF5_BOOTLOADER
 	  If selected, applications are linked so that they can be loaded by Nordic
 	  nRF5 bootloader.
 
-endif # BOARD_NRF52840_PCA10059
+endif # BOARD_NRF52840DONGLE_NRF52840

boards/arm/nrf52840dongle_nrf52840/Kconfig.board

@@ -0,0 +1,8 @@
+# nRF52840 Dongle NRF52840 board configuration
+
+# Copyright (c) 2018 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF52840DONGLE_NRF52840
+	bool "nRF52840 DONGLE NRF52840"
+	depends on SOC_NRF52840_QIAA

boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig

@@ -1,13 +1,13 @@
-# nRF52 PCA10059 board configuration
+# nRF52840 Dongle NRF52840 board configuration
 #
 # Copyright (c) 2018 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_NRF52840_PCA10059
+if BOARD_NRF52840DONGLE_NRF52840
 
 config BOARD
-	default "nrf52840_pca10059"
+	default "nrf52840dongle_nrf52840"
 
 # To let the nRF5 bootloader load an application, the application
 # must be linked after Nordic MBR, that is factory-programmed on the board.
@@ -49,4 +49,4 @@ config IEEE802154_NRF5
 config BT_CTLR
 	default BT
 
-endif # BOARD_NRF52840_PCA10059
+endif # BOARD_NRF52840DONGLE_NRF52840

boards/arm/nrf52840dongle_nrf52840/board.c

@@ -7,11 +7,11 @@
 #include <init.h>
 #include <hal/nrf_power.h>
 
-static int board_nrf52840_pca10059_init(struct device *dev)
+static int board_nrf52840dongle_nrf52840_init(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	/* if the nrf52840_pca10059 board is powered from USB
+	/* if the nrf52840dongle_nrf52840 board is powered from USB
 	 * (high voltage mode), GPIO output voltage is set to 1.8 volts by
 	 * default and that is not enough to turn the green and blue LEDs on.
 	 * Increase GPIO voltage to 3.0 volts.
@@ -42,5 +42,5 @@ static int board_nrf52840_pca10059_init(struct device *dev)
 	return 0;
 }
 
-SYS_INIT(board_nrf52840_pca10059_init, PRE_KERNEL_1,
+SYS_INIT(board_nrf52840dongle_nrf52840_init, PRE_KERNEL_1,
 	 CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

boards/arm/nrf52840dongle_nrf52840/doc/index.rst

@@ -1,12 +1,12 @@
-.. _nrf52840_pca10059:
+.. _nrf52840dongle_nrf52840:
 
-nRF52840-PCA10059
-#################
+nRF52840 Dongle
+###############
 
 Overview
 ********
 
-The nRF52840 PCA10059 (USB Dongle) hardware provides support for the Nordic
+The nRF52840 Dongle (PCA10059) hardware provides support for the Nordic
 Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices:
 
 * :abbr:`ADC (Analog to Digital Converter)`
@@ -24,28 +24,32 @@ Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf52840_pca10059.jpg
+.. figure:: img/nrf52840dongle_nrf52840.jpg
      :width: 442px
      :align: center
      :alt: nRF52840 Dongle
 
-     nRF52840 PCA10059
+     nRF52840 Dongle
 
 More information about the board can be found at the
 `nRF52840 Dongle website`_. The `Nordic Semiconductor Infocenter`_
 contains the processor's information and the datasheet.
 
+.. note::
+
+   In previous Zephyr releases this board was named *nrf52840_pca10059*.
+
 Hardware
 ********
 
-The ``nrf52840_pca10059`` has two external oscillators. The frequency of
+The ``nrf52840dongle_nrf52840`` has two external oscillators. The frequency of
 the slow clock is 32.768 kHz. The frequency of the main clock
 is 32 MHz.
 
 Supported Features
 ==================
 
-The ``nrf52840_pca10059`` board configuration supports the following
+The ``nrf52840dongle_nrf52840`` board configuration supports the following
 hardware features:
 
 +-----------+------------+----------------------+
@@ -83,7 +87,7 @@ hardware features:
 
 Other hardware features are not supported by the Zephyr kernel.
 See `nRF52840 Dongle website`_ and `Nordic Semiconductor Infocenter`_
-for a complete list of nRF52840 PCA10059 Development Kit board hardware features.
+for a complete list of nRF52840 Dongle board hardware features.
 
 Connections and IOs
 ===================
@@ -105,7 +109,7 @@ Push buttons
 Programming and Debugging
 *************************
 
-Applications for the ``nrf52840_pca10059`` board configuration can be
+Applications for the ``nrf52840dongle_nrf52840`` board configuration can be
 built in the usual way (see :ref:`build_an_application` for more details).
 
 Flashing
@@ -144,7 +148,7 @@ device. Make sure ``nrfutil`` is installed before proceeding.
 
    .. zephyr-app-commands::
       :app: zephyr/samples/basic/blinky
-      :board: nrf52840_pca10059
+      :board: nrf52840dongle_nrf52840
       :goals: build
 
 #. Package the application for the bootloader using ``nrfutil``:
@@ -190,7 +194,7 @@ to the zephyr repository on your computer.
 
    .. zephyr-app-commands::
       :app: mcuboot/boot/zephyr
-      :board: nrf52840_pca10059
+      :board: nrf52840dongle_nrf52840
       :build-dir: mcuboot
       :goals: build
 
@@ -232,7 +236,7 @@ over Bluetooth).
 
    .. zephyr-app-commands::
       :app: zephyr/samples/subsys/mgmt/mcumgr/smp_svr
-      :board: nrf52840_pca10059
+      :board: nrf52840dongle_nrf52840
       :build-dir: smp_svr
       :goals: build
 
@@ -269,7 +273,7 @@ name.
 
    .. zephyr-app-commands::
       :app: zephyr/samples/basic/blinky
-      :board: nrf52840_pca10059
+      :board: nrf52840dongle_nrf52840
       :build-dir: blinky
       :goals: build
       :gen-args: -DCONFIG_BOOTLOADER_MCUBOOT=y
@@ -287,7 +291,7 @@ For Segger J-Link debug probes, follow the instructions in the
 :ref:`nordic_segger` page to install and configure all the necessary
 software. Further information can be found in :ref:`nordic_segger_flashing`.
 
-Locate the DTS file for the board under: boards/arm/nrf52840_pca10059.
+Locate the DTS file for the board under: boards/arm/nrf52840dongle_nrf52840.
 This file requires a small modification to use a different partition table.
 Edit the include directive to include "fstab-debugger" instead of "fstab-stock".
 
@@ -298,7 +302,7 @@ Here is an example for the :ref:`blinky-sample` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/blinky
-   :board: nrf52840_pca10059
+   :board: nrf52840dongle_nrf52840
    :goals: build flash
 
 Observe the LED on the board blinking.
@@ -306,13 +310,13 @@ Observe the LED on the board blinking.
 Debugging
 =========
 
-The ``nrf52840_pca10059`` board does not have an on-board J-Link debug IC
+The ``nrf52840dongle_nrf52840`` board does not have an on-board J-Link debug IC
 as some nRF5x development boards, however, instructions from the
 :ref:`nordic_segger` page also apply to this board, with the additional step
 of connecting an external debugger.
 
-Testing the LEDs and buttons on the nRF52840 PCA10059
-*****************************************************
+Testing the LEDs and buttons on the nRF52840 Dongle
+***************************************************
 
 There are 2 samples that allow you to test that the buttons (switches) and LEDs on
 the board are working properly with Zephyr:

boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts

@@ -9,8 +9,8 @@
 #include <nordic/nrf52840_qiaa.dtsi>
 
 / {
-	model = "Nordic PCA10059 Dev Kit";
-	compatible = "nordic,pca10059-dk", "nordic,nrf52840-qiaa",
+	model = "Nordic nRF52840 Dongle NRF52840";
+	compatible = "nordic,nrf52840-dongle-nrf52840", "nordic,nrf52840-qiaa",
 		     "nordic,nrf52840";
 
 	chosen {

boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.yaml

@@ -1,5 +1,5 @@
-identifier: nrf52840_pca10059
-name: nRF52840-PCA10059
+identifier: nrf52840dongle_nrf52840
+name: nRF52840-Dongle-NRF52840
 type: mcu
 arch: arm
 ram: 256

boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig

@@ -2,7 +2,7 @@
 
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_NRF52840_PCA10059=y
+CONFIG_BOARD_NRF52840DONGLE_NRF52840=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y

boards/deprecated.cmake

@@ -14,6 +14,7 @@ set(nrf52_pca10040_DEPRECATED nrf52dk_nrf52832)
 set(nrf52810_pca10040_DEPRECATED nrf52dk_nrf52810)
 set(nrf52833_pca10100_DEPRECATED nrf52833dk_nrf52833)
 set(nrf52840_pca10056_DEPRECATED nrf52840dk_nrf52840)
+set(nrf52840_pca10059_DEPRECATED nrf52840dongle_nrf52840)
 set(nrf52811_pca10056_DEPRECATED nrf52840dk_nrf52811)
 set(nrf9160_pca10090_DEPRECATED nrf9160dk_nrf9160)
 set(nrf9160_pca10090ns_DEPRECATED nrf9160dk_nrf9160ns)

doc/conf.py

@@ -346,7 +346,8 @@ html_redirect_pages = [
 		('boards/arm/nrf52840_pca10056/doc/nrf52840_pca10056/index', 'boards/arm/nrf52840dk_nrf52840/doc/index'),
 		('boards/arm/nrf9160_pca10090/doc/nrf9160_pca10090/index', 'boards/arm/nrf9160dk_nrf9160/doc/index'),
 		('boards/arm/nrf52840_pca10090/doc/nrf52840_pca10090/index', 'boards/arm/nrf9160dk_nrf52840/doc/index'),
-		('boards/arm/nrf52840_pca10059/doc/nrf52840_pca10059', 'boards/arm/nrf52840_pca10059/doc/index'),
+		('boards/arm/nrf52840_pca10059/doc/nrf52840_pca10059', 'boards/arm/nrf52840dongle_nrf52840/doc/index'),
+		('boards/arm/nrf52840_pca10059/doc/nrf52840_pca10059/index', 'boards/arm/nrf52840dongle_nrf52840/doc/index'),
 		('boards/arm/nrf52_adafruit_feather/doc/nrf52_adafruit_feather', 'boards/arm/nrf52_adafruit_feather/doc/index'),
 		('boards/arm/nrf52_blenano2/doc/nrf52_blenano2', 'boards/arm/nrf52_blenano2/doc/index'),
 		('boards/arm/nrf52_pca10040/doc/nrf52_pca10040', 'boards/arm/nrf52dk_nrf52832/doc/index'),

samples/subsys/usb/hid-cdc/sample.yaml

@@ -3,6 +3,6 @@ sample:
 tests:
   sample.usb.hid-cdc:
     depends_on: usb_device
-    platform_whitelist: nrf52840dk_nrf52840 nrf52840_pca10059
+    platform_whitelist: nrf52840dk_nrf52840 nrf52840dongle_nrf52840
     harness: button
     tags: usb

tests/drivers/adc/adc_api/src/test_adc.c

@@ -41,7 +41,7 @@
 
 #elif defined(CONFIG_BOARD_NRF52DK_NRF52832) || \
 	defined(CONFIG_BOARD_NRF52840DK_NRF52840) || \
-	defined(CONFIG_BOARD_NRF52840_PCA10059) || \
+	defined(CONFIG_BOARD_NRF52840DONGLE_NRF52840) || \
 	defined(CONFIG_BOARD_NRF52840_BLIP) || \
 	defined(CONFIG_BOARD_NRF52840_PAPYR) || \
 	defined(CONFIG_BOARD_NRF52833DK_NRF52833) || \

west.yml

@@ -83,7 +83,7 @@ manifest:
       revision: cf7020eb4c7ef93319f2d6d2403a21e12a879bf6
       path: modules/crypto/mbedtls
     - name: mcuboot
-      revision: a5046693a2a997012284210adb5837d817b1662e
+      revision: 41c5d50ec7cd295dd39a7a12ee26abefe8b3ab0f
       path: bootloader/mcuboot
     - name: mcumgr
       revision: dcf32c7f340a10e6e6482feb311cb4fa71953fd3