diff --git a/boards/arm/nrf52833_pca10100/Kconfig b/boards/arm/nrf52833dk_nrf52833/Kconfig similarity index 67% rename from boards/arm/nrf52833_pca10100/Kconfig rename to boards/arm/nrf52833dk_nrf52833/Kconfig index 7cfced03806..057d5c7ef95 100644 --- a/boards/arm/nrf52833_pca10100/Kconfig +++ b/boards/arm/nrf52833dk_nrf52833/Kconfig @@ -1,4 +1,4 @@ -# nRF52833 PCA10100 board configuration +# nRF52833 DK NRF52833 board configuration # Copyright (c) 2019 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 @@ -7,4 +7,4 @@ config BOARD_ENABLE_DCDC bool "Enable DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_NRF52833_PCA10100 + depends on BOARD_NRF52833DK_NRF52833 diff --git a/boards/arm/nrf52833_pca10100/Kconfig.board b/boards/arm/nrf52833dk_nrf52833/Kconfig.board similarity index 52% rename from boards/arm/nrf52833_pca10100/Kconfig.board rename to boards/arm/nrf52833dk_nrf52833/Kconfig.board index d6d8508236e..11ab4befc97 100644 --- a/boards/arm/nrf52833_pca10100/Kconfig.board +++ b/boards/arm/nrf52833dk_nrf52833/Kconfig.board @@ -1,8 +1,8 @@ -# nRF52833 PCA10100 board configuration +# nRF52833 DK NRF52833 board configuration # Copyright (c) 2019 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -config BOARD_NRF52833_PCA10100 - bool "NRF52833 PCA10100" +config BOARD_NRF52833DK_NRF52833 + bool "NRF52833 DK NRF52833" depends on SOC_NRF52833_QIAA diff --git a/boards/arm/nrf52833_pca10100/Kconfig.defconfig b/boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig similarity index 72% rename from boards/arm/nrf52833_pca10100/Kconfig.defconfig rename to boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig index 7878e674d4b..284d50035ae 100644 --- a/boards/arm/nrf52833_pca10100/Kconfig.defconfig +++ b/boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig @@ -1,12 +1,12 @@ -# nRF52833 PCA10100 board configuration +# nRF52833 DK NRF52833 board configuration # Copyright (c) 2019 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52833_PCA10100 +if BOARD_NRF52833DK_NRF52833 config BOARD - default "nrf52833_pca10100" + default "nrf52833dk_nrf52833" config ADC_0 default y @@ -33,4 +33,4 @@ config IEEE802154_NRF5 config BT_CTLR default BT -endif # BOARD_NRF52833_PCA10100 +endif # BOARD_NRF52833DK_NRF52833 diff --git a/boards/arm/nrf52833_pca10100/board.cmake b/boards/arm/nrf52833dk_nrf52833/board.cmake similarity index 100% rename from boards/arm/nrf52833_pca10100/board.cmake rename to boards/arm/nrf52833dk_nrf52833/board.cmake diff --git a/boards/arm/nrf52833_pca10100/doc/index.rst b/boards/arm/nrf52833dk_nrf52833/doc/index.rst similarity index 87% rename from boards/arm/nrf52833_pca10100/doc/index.rst rename to boards/arm/nrf52833dk_nrf52833/doc/index.rst index dedc537bc91..02b5fe1c1bb 100644 --- a/boards/arm/nrf52833_pca10100/doc/index.rst +++ b/boards/arm/nrf52833dk_nrf52833/doc/index.rst @@ -1,12 +1,12 @@ -.. _nrf52833_pca10100: +.. _nrf52833dk_nrf52833: -nRF52833-PCA10100 -################# +nRF52833 DK +########### Overview ******** -The nRF52833 Preview Development Kit (PCA10100) hardware provides +The nRF52833 Development Kit (PCA10100) hardware provides support for the Nordic Semiconductor nRF52833 ARM Cortex-M4F CPU and the following devices: @@ -27,20 +27,24 @@ the following devices: * :abbr:`WDT (Watchdog Timer)` More information about the board can be found at the -`nRF52833 PDK website`_. The `Nordic Semiconductor Infocenter`_ +`nRF52833 DK website`_. The `Nordic Semiconductor Infocenter`_ contains the processor's information and the datasheet. +.. note:: + + In previous Zephyr releases this board was named *nrf52833_pca10100*. + Hardware ******** -nRF52833 PDK has two external oscillators. The frequency of +nRF52833 DK 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 nrf52833_pca10100 board configuration supports the following +The nrf52833dk_nrf52833 board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -79,7 +83,7 @@ hardware features: +-----------+------------+----------------------+ Other hardware features are not supported by the Zephyr kernel. -See `nRF52833 PDK website`_ and `Nordic Semiconductor Infocenter`_ +See `nRF52833 DK website`_ and `Nordic Semiconductor Infocenter`_ for a complete list of nRF52833 Development Kit board hardware features. Connections and IOs @@ -105,7 +109,7 @@ Push buttons Programming and Debugging ************************* -Applications for the ``nrf52833_pca10100`` board configuration can be +Applications for the ``nrf52833dk_nrf52833`` board configuration can be built and flashed in the usual way (see :ref:`build_an_application` and :ref:`application_run` for more details); however, the standard debugging targets are not currently available. @@ -134,7 +138,7 @@ Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf52833_pca10100 + :board: nrf52833dk_nrf52833 :goals: build flash Debugging @@ -144,8 +148,8 @@ Refer to the :ref:`nordic_segger` page to learn about debugging Nordic boards wi Segger IC. -Testing the LEDs and buttons in the nRF52833 PDK -************************************************ +Testing the LEDs and buttons in the nRF52833 DK +*********************************************** There are 2 samples that allow you to test that the buttons (switches) and LEDs on the board are working properly with Zephyr: @@ -155,7 +159,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/nrf52833_pca10100/nrf52833_pca10100.dts`. +:zephyr_file:`boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts`. Using UART1 *********** @@ -167,7 +171,7 @@ more than one UART for connecting peripheral devices: .. code-block:: console - $ cat nrf52833_pca10100.overlay + $ cat nrf52833dk_nrf52833.overlay &uart1 { compatible = "nordic,nrf-uarte"; current-speed = <115200>; @@ -211,7 +215,7 @@ References .. target-notes:: -.. _nRF52833 PDK website: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52833-DK +.. _nRF52833 DK website: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52833-DK .. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com .. _J-Link Software and documentation pack: https://www.segger.com/jlink-software.html .. _nRF52833 Product Specification: https://infocenter.nordicsemi.com/pdf/nRF52833_OPS_v0.7.pdf diff --git a/boards/arm/nrf52833_pca10100/nrf52833_pca10100.dts b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts similarity index 97% rename from boards/arm/nrf52833_pca10100/nrf52833_pca10100.dts rename to boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts index f05a41bc2d2..1678d4a34ca 100644 --- a/boards/arm/nrf52833_pca10100/nrf52833_pca10100.dts +++ b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts @@ -8,8 +8,8 @@ #include / { - model = "Nordic PCA10100 Dev Kit"; - compatible = "nordic,pca10100-dk", "nordic,nrf52833-qiaa", + model = "Nordic nRF52833 DK NRF52833"; + compatible = "nordic,nrf52833-dk-nrf52833", "nordic,nrf52833-qiaa", "nordic,nrf52833"; chosen { diff --git a/boards/arm/nrf52833_pca10100/nrf52833_pca10100.yaml b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.yaml similarity index 78% rename from boards/arm/nrf52833_pca10100/nrf52833_pca10100.yaml rename to boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.yaml index 57b6f9a4e70..08dee8b3f6f 100644 --- a/boards/arm/nrf52833_pca10100/nrf52833_pca10100.yaml +++ b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.yaml @@ -1,5 +1,5 @@ -identifier: nrf52833_pca10100 -name: nRF52833-PCA10100 +identifier: nrf52833dk_nrf52833 +name: nRF52833-DK-NRF52833 type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf52833_pca10100/nrf52833_pca10100_defconfig b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833_defconfig similarity index 90% rename from boards/arm/nrf52833_pca10100/nrf52833_pca10100_defconfig rename to boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833_defconfig index 8fe2b0025bc..184b161f4d0 100644 --- a/boards/arm/nrf52833_pca10100/nrf52833_pca10100_defconfig +++ b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52833_QIAA=y -CONFIG_BOARD_NRF52833_PCA10100=y +CONFIG_BOARD_NRF52833DK_NRF52833=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake index f8f67b82e3e..c036403ca17 100644 --- a/boards/deprecated.cmake +++ b/boards/deprecated.cmake @@ -12,6 +12,7 @@ set(nrf51_pca10028_DEPRECATED nrf51dk_nrf51422) set(nrf51_pca10031_DEPRECATED nrf51dongle_nrf51422) 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(nrf52811_pca10056_DEPRECATED nrf52840dk_nrf52811) set(nrf9160_pca10090_DEPRECATED nrf9160dk_nrf9160) diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c index 444b84b81db..5209a3ce3af 100644 --- a/tests/drivers/adc/adc_api/src/test_adc.c +++ b/tests/drivers/adc/adc_api/src/test_adc.c @@ -44,7 +44,7 @@ defined(CONFIG_BOARD_NRF52840_PCA10059) || \ defined(CONFIG_BOARD_NRF52840_BLIP) || \ defined(CONFIG_BOARD_NRF52840_PAPYR) || \ - defined(CONFIG_BOARD_NRF52833_PCA10100) || \ + defined(CONFIG_BOARD_NRF52833DK_NRF52833) || \ defined(CONFIG_BOARD_BL652_DVK) || \ defined(CONFIG_BOARD_BL654_DVK) || \ defined(CONFIG_BOARD_DEGU_EVK) || \ diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf52833_pca10100.conf b/tests/drivers/counter/counter_basic_api/boards/nrf52833dk_nrf52833.conf similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/nrf52833_pca10100.conf rename to tests/drivers/counter/counter_basic_api/boards/nrf52833dk_nrf52833.conf diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf52833_pca10100.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf52833dk_nrf52833.overlay similarity index 99% rename from tests/drivers/counter/counter_basic_api/boards/nrf52833_pca10100.overlay rename to tests/drivers/counter/counter_basic_api/boards/nrf52833dk_nrf52833.overlay index ba555e0f823..a795afb4b17 100644 --- a/tests/drivers/counter/counter_basic_api/boards/nrf52833_pca10100.overlay +++ b/tests/drivers/counter/counter_basic_api/boards/nrf52833dk_nrf52833.overlay @@ -21,4 +21,3 @@ &rtc0 { ppi-wrap; }; -