boards: nrf52_pca20020: Rename to thingy52_nrf52832
The board name for the Thingy:52, so far known as nrf52_pca20020, is
renamed to thingy52_nrf52832. 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>
diff --git a/boards/arm/nrf52_pca20020/Kconfig.board b/boards/arm/nrf52_pca20020/Kconfig.board
deleted file mode 100644
index c542643..0000000
--- a/boards/arm/nrf52_pca20020/Kconfig.board
+++ /dev/null
@@ -1,9 +0,0 @@
-# nRF52 PCA20020 board configuration
-
-# Copyright (c) 2018 Aapo Vienamo
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NRF52_PCA20020
- bool "nRF52 PCA20020"
- select GPIO
- depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_pca20020/Kconfig.defconfig b/boards/arm/nrf52_pca20020/Kconfig.defconfig
deleted file mode 100644
index fd0a92e..0000000
--- a/boards/arm/nrf52_pca20020/Kconfig.defconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# nRF52 PCA20020 board configuration
-
-# Copyright (c) 2018 Aapo Vienamo
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NRF52_PCA20020
-
-config BOARD
- default "nrf52_pca20020"
-
-config ADC_0
- default y
- depends on ADC
-
-config I2C
- default y
-
-config BT_CTLR
- default BT
-
-endif # BOARD_NRF52_PCA20020
diff --git a/boards/arm/nrf52_pca20020/CMakeLists.txt b/boards/arm/thingy52_nrf52832/CMakeLists.txt
similarity index 100%
rename from boards/arm/nrf52_pca20020/CMakeLists.txt
rename to boards/arm/thingy52_nrf52832/CMakeLists.txt
diff --git a/boards/arm/nrf52_pca20020/Kconfig b/boards/arm/thingy52_nrf52832/Kconfig
similarity index 85%
rename from boards/arm/nrf52_pca20020/Kconfig
rename to boards/arm/thingy52_nrf52832/Kconfig
index 58040a2..da2e864 100644
--- a/boards/arm/nrf52_pca20020/Kconfig
+++ b/boards/arm/thingy52_nrf52832/Kconfig
@@ -1,9 +1,9 @@
-# nRF52_PCA20020 board configuration
+# Thingy52 NRF52832 board configuration
# Copyright (c) 2018 Aapo Vienamo
# SPDX-License-Identifier: Apache-2.0
-if BOARD_NRF52_PCA20020
+if BOARD_THINGY52_NRF52832
config BOARD_VDD_PWR_CTRL_INIT_PRIORITY
int "VDD power rail init priority"
@@ -22,4 +22,4 @@
CCS811 gas sensor. The value has to be greater than
BOARD_VDD_PWR_CTRL_INIT_PRIORITY, but smaller than SENSOR_INIT_PRIORITY.
-endif # BOARD_NRF52_PCA20020
+endif # BOARD_THINGY52_NRF52832
diff --git a/boards/arm/thingy52_nrf52832/Kconfig.board b/boards/arm/thingy52_nrf52832/Kconfig.board
new file mode 100644
index 0000000..c5c6e14
--- /dev/null
+++ b/boards/arm/thingy52_nrf52832/Kconfig.board
@@ -0,0 +1,9 @@
+# Thingy52 NRF52832 board configuration
+
+# Copyright (c) 2018 Aapo Vienamo
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_THINGY52_NRF52832
+ bool "Thingy52 NRF52832"
+ select GPIO
+ depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/thingy52_nrf52832/Kconfig.defconfig b/boards/arm/thingy52_nrf52832/Kconfig.defconfig
new file mode 100644
index 0000000..2886b58
--- /dev/null
+++ b/boards/arm/thingy52_nrf52832/Kconfig.defconfig
@@ -0,0 +1,21 @@
+# Thingy52 NRF52832 board configuration
+
+# Copyright (c) 2018 Aapo Vienamo
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_THINGY52_NRF52832
+
+config BOARD
+ default "thingy52_nrf52832"
+
+config ADC_0
+ default y
+ depends on ADC
+
+config I2C
+ default y
+
+config BT_CTLR
+ default BT
+
+endif # BOARD_THINGY52_NRF52832
diff --git a/boards/arm/nrf52_pca20020/board.c b/boards/arm/thingy52_nrf52832/board.c
similarity index 100%
rename from boards/arm/nrf52_pca20020/board.c
rename to boards/arm/thingy52_nrf52832/board.c
diff --git a/boards/arm/nrf52_pca20020/board.cmake b/boards/arm/thingy52_nrf52832/board.cmake
similarity index 100%
rename from boards/arm/nrf52_pca20020/board.cmake
rename to boards/arm/thingy52_nrf52832/board.cmake
diff --git a/boards/arm/nrf52_pca20020/doc/img/nrf52_pca20020.jpg b/boards/arm/thingy52_nrf52832/doc/img/thingy52_nrf52832.jpg
similarity index 100%
rename from boards/arm/nrf52_pca20020/doc/img/nrf52_pca20020.jpg
rename to boards/arm/thingy52_nrf52832/doc/img/thingy52_nrf52832.jpg
Binary files differ
diff --git a/boards/arm/nrf52_pca20020/doc/index.rst b/boards/arm/thingy52_nrf52832/doc/index.rst
similarity index 96%
rename from boards/arm/nrf52_pca20020/doc/index.rst
rename to boards/arm/thingy52_nrf52832/doc/index.rst
index f7c8cf5..27e3197 100644
--- a/boards/arm/nrf52_pca20020/doc/index.rst
+++ b/boards/arm/thingy52_nrf52832/doc/index.rst
@@ -1,14 +1,14 @@
-.. _nrf52_pca20020:
+.. _thingy52_nrf52832:
-nRF52-PCA20020 (Thingy:52)
-##########################
+Thingy:52
+#########
Overview
********
-Zephyr uses the nrf52_pca20020 board configuration for building for the
-Thingy:52 board. The board has the nRF52832 MCU with ARM Cortex-M4F processor,
-a set of environmental sensors, a pushbutton, and two RGB LEDs.
+Zephyr uses the thingy52_nrf52832 (PCA20020) board configuration for building
+for the Thingy:52 board. The board has the nRF52832 MCU with ARM Cortex-M4F
+processor, a set of environmental sensors, a pushbutton, and two RGB LEDs.
* :abbr:`ADC (Analog to Digital Converter)`
* CLOCK
@@ -29,7 +29,7 @@
* :abbr:`UART (Universal asynchronous receiver-transmitter)`
* :abbr:`WDT (Watchdog Timer)`
-.. figure:: img/nrf52_pca20020.jpg
+.. figure:: img/thingy52_nrf52832.jpg
:width: 442px
:align: center
:alt: nRF52 Thingy:52
@@ -40,6 +40,10 @@
`Nordic Semiconductor Infocenter`_ contains the processor's information and the
datasheet.
+.. note::
+
+ In previous Zephyr releases this board was named *nrf52_pca20020*.
+
Hardware
********
@@ -366,7 +370,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/basic/blinky
- :board: nrf52_pca20020
+ :board: thingy52_nrf52832
:goals: build flash
@@ -376,7 +380,7 @@
.. zephyr-app-commands::
:zephyr-app: samples/sensor/hts221
- :board: nrf52_pca20020
+ :board: thingy52_nrf52832
:goals: build flash
References
diff --git a/boards/arm/nrf52_pca20020/nrf52_pca20020.dts b/boards/arm/thingy52_nrf52832/thingy52_nrf52832.dts
similarity index 96%
rename from boards/arm/nrf52_pca20020/nrf52_pca20020.dts
rename to boards/arm/thingy52_nrf52832/thingy52_nrf52832.dts
index 309be66..55cdbe1 100644
--- a/boards/arm/nrf52_pca20020/nrf52_pca20020.dts
+++ b/boards/arm/thingy52_nrf52832/thingy52_nrf52832.dts
@@ -10,8 +10,8 @@
#include <nordic/nrf52832_qfaa.dtsi>
/ {
- model = "Nordic PCA20020 Dev Kit";
- compatible = "nordic,pca20020-dk", "nordic,nrf52832-qfaa",
+ model = "Nordic Thingy52 NRF52832";
+ compatible = "nordic,thingy52-nrf52832", "nordic,nrf52832-qfaa",
"nordic,nrf52832";
chosen {
diff --git a/boards/arm/nrf52_pca20020/nrf52_pca20020.yaml b/boards/arm/thingy52_nrf52832/thingy52_nrf52832.yaml
similarity index 67%
rename from boards/arm/nrf52_pca20020/nrf52_pca20020.yaml
rename to boards/arm/thingy52_nrf52832/thingy52_nrf52832.yaml
index 86dc494..7216a14 100644
--- a/boards/arm/nrf52_pca20020/nrf52_pca20020.yaml
+++ b/boards/arm/thingy52_nrf52832/thingy52_nrf52832.yaml
@@ -1,5 +1,5 @@
-identifier: nrf52_pca20020
-name: nRF52-PCA20020
+identifier: thingy52_nrf52832
+name: Thingy52-NRF52832
type: mcu
arch: arm
ram: 64
diff --git a/boards/arm/nrf52_pca20020/nrf52_pca20020_defconfig b/boards/arm/thingy52_nrf52832/thingy52_nrf52832_defconfig
similarity index 87%
rename from boards/arm/nrf52_pca20020/nrf52_pca20020_defconfig
rename to boards/arm/thingy52_nrf52832/thingy52_nrf52832_defconfig
index a5d3994..86b2e85 100644
--- a/boards/arm/nrf52_pca20020/nrf52_pca20020_defconfig
+++ b/boards/arm/thingy52_nrf52832/thingy52_nrf52832_defconfig
@@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52832_QFAA=y
-CONFIG_BOARD_NRF52_PCA20020=y
+CONFIG_BOARD_THINGY52_NRF52832=y
# Enable MPU
CONFIG_ARM_MPU=y
diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
index 128c037..b5992b8 100644
--- a/boards/deprecated.cmake
+++ b/boards/deprecated.cmake
@@ -11,6 +11,7 @@
set(nrf51_pca10028_DEPRECATED nrf51dk_nrf51422)
set(nrf51_pca10031_DEPRECATED nrf51dongle_nrf51422)
set(nrf52_pca10040_DEPRECATED nrf52dk_nrf52832)
+set(nrf52_pca20020_DEPRECATED thingy52_nrf52832)
set(nrf52810_pca10040_DEPRECATED nrf52dk_nrf52810)
set(nrf52833_pca10100_DEPRECATED nrf52833dk_nrf52833)
set(nrf52840_pca10056_DEPRECATED nrf52840dk_nrf52840)
diff --git a/doc/conf.py b/doc/conf.py
index 781a80f..a8837a3 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -352,7 +352,8 @@
('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'),
('boards/arm/nrf52_pca10040/doc/nrf52_pca10040/index', 'boards/arm/nrf52dk_nrf52832/doc/index'),
- ('boards/arm/nrf52_pca20020/doc/nrf52_pca20020', 'boards/arm/nrf52_pca20020/doc/index'),
+ ('boards/arm/nrf52_pca20020/doc/nrf52_pca20020', 'boards/arm/thingy52_nrf52832/doc/index'),
+ ('boards/arm/nrf52_pca20020/doc/nrf52_pca20020/index', 'boards/arm/thingy52_nrf52832/doc/index'),
('boards/arm/nrf52_vbluno52/doc/nrf52_vbluno52', 'boards/arm/nrf52_vbluno52/doc/index'),
('boards/arm/nucleo_f030r8/doc/nucleof030r8', 'boards/arm/nucleo_f030r8/doc/index'),
('boards/arm/nucleo_f070rb/doc/nucleof070rb', 'boards/arm/nucleo_f070rb/doc/index'),
diff --git a/samples/boards/nrf/battery/sample.yaml b/samples/boards/nrf/battery/sample.yaml
index 502fab0..4de80f0 100644
--- a/samples/boards/nrf/battery/sample.yaml
+++ b/samples/boards/nrf/battery/sample.yaml
@@ -3,5 +3,5 @@
tests:
sample.boards.nrf.battery:
build_only: true
- platform_whitelist: particle_xenon nrf52_pca20020
+ platform_whitelist: particle_xenon thingy52_nrf52832
tags: battery
diff --git a/samples/boards/nrf/battery/src/battery.c b/samples/boards/nrf/battery/src/battery.c
index 683c7a7..bac797a 100644
--- a/samples/boards/nrf/battery/src/battery.c
+++ b/samples/boards/nrf/battery/src/battery.c
@@ -22,7 +22,7 @@
#define VBATT DT_PATH(vbatt)
-#ifdef CONFIG_BOARD_NRF52_PCA20020
+#ifdef CONFIG_BOARD_THINGY52_NRF52832
/* This board uses a divider that reduces max voltage to
* reference voltage (600 mV).
*/
diff --git a/samples/sensor/ccs811/README.rst b/samples/sensor/ccs811/README.rst
index dd11c96..771c50e 100644
--- a/samples/sensor/ccs811/README.rst
+++ b/samples/sensor/ccs811/README.rst
@@ -17,12 +17,12 @@
Building and Running
********************
-Building and Running on nrf52_pca20020
-======================================
+Building and Running on thingy52_nrf52832
+=========================================
.. zephyr-app-commands::
:zephyr-app: samples/sensor/ccs811
- :board: nrf52_pca20020
+ :board: thingy52_nrf52832
:goals: build flash
:compact:
@@ -32,7 +32,7 @@
The sample output below is from a `Nordic Thingy:52
<https://www.nordicsemi.com/Software-and-tools/Prototyping-platforms/Nordic-Thingy-52>`_
-(nrf52_pca20020) that includes this sensor (and others).
+(thingy52_nrf52832) that includes this sensor (and others).
After a soft reset, there is a 5-second startup period
where readings are unstable, and then we can see steady
reported measurements of about 400 ppm eC02 and 0 ppb eTVOC.
diff --git a/samples/sensor/ccs811/sample.yaml b/samples/sensor/ccs811/sample.yaml
index af83cfd..c3061e4 100644
--- a/samples/sensor/ccs811/sample.yaml
+++ b/samples/sensor/ccs811/sample.yaml
@@ -11,5 +11,5 @@
sample.sensor.ccs811:
harness: sensor
tags: sensors
- platform_whitelist: nrf52_pca20020
+ platform_whitelist: thingy52_nrf52832
depends_on: i2c
diff --git a/samples/sensor/lis2dh/README.rst b/samples/sensor/lis2dh/README.rst
index 9714949..de4bd3d 100644
--- a/samples/sensor/lis2dh/README.rst
+++ b/samples/sensor/lis2dh/README.rst
@@ -29,7 +29,7 @@
and shields supported by Zephyr, including:
* :ref:`actinius_icarus`
-* :ref:`nrf52_pca20020`
+* :ref:`thingy52_nrf52832`
* :ref:`stm32f3_disco_board`
* :ref:`x-nucleo-iks01a2`
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf52_pca20020.overlay b/tests/drivers/gpio/gpio_basic_api/boards/thingy52_nrf52832.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_basic_api/boards/nrf52_pca20020.overlay
rename to tests/drivers/gpio/gpio_basic_api/boards/thingy52_nrf52832.overlay