From 88bf06bb01b3048bbb62d288d96e6a4ebd87ca62 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Fri, 3 Apr 2020 16:58:27 +0200 Subject: [PATCH] boards: arm: nrf5340_dk_nrf5340: rename target to nrf5340pdk_nrf5340 We rename the nRF53 Dev Kit board target (nrf5340_dk_nrf5340) to nrf5340pdk_nrf5340. We update all associated references in the supportive documentation and all nRF5340-related cofigurations and overlay files in the samples and tests in the tree. Signed-off-by: Ioannis Glaropoulos --- boards/arm/nrf5340_dk_nrf5340/Kconfig.board | 18 ------ .../CMakeLists.txt | 2 +- .../Kconfig | 10 ++-- boards/arm/nrf5340pdk_nrf5340/Kconfig.board | 18 ++++++ .../Kconfig.defconfig | 22 +++---- .../board.cmake | 5 +- .../doc/img/nrf5340pdk.png} | Bin .../doc/index.rst | 54 ++++++++++-------- .../nrf5340_cpunet_reset.c | 2 +- .../nrf5340pdk_nrf5340_cpuapp.dts} | 4 +- .../nrf5340pdk_nrf5340_cpuapp.yaml} | 4 +- .../nrf5340pdk_nrf5340_cpuapp_common.dts} | 10 ++-- .../nrf5340pdk_nrf5340_cpuapp_defconfig} | 2 +- ...5340pdk_nrf5340_cpuapp_partition_conf.dts} | 8 +-- .../nrf5340pdk_nrf5340_cpuappns.dts} | 4 +- .../nrf5340pdk_nrf5340_cpuappns.yaml} | 4 +- .../nrf5340pdk_nrf5340_cpuappns_defconfig} | 2 +- .../nrf5340pdk_nrf5340_cpunet.dts} | 10 ++-- .../nrf5340pdk_nrf5340_cpunet.yaml} | 4 +- .../nrf5340pdk_nrf5340_cpunet_defconfig} | 2 +- ...pdk_nrf5340_shared_sram_planning_conf.dts} | 0 drivers/bluetooth/hci/Kconfig | 2 +- samples/bluetooth/hci_rpmsg/sample.yaml | 2 +- ...rlay => nrf5340pdk_nrf5340_cpuapp.overlay} | 0 24 files changed, 96 insertions(+), 93 deletions(-) delete mode 100644 boards/arm/nrf5340_dk_nrf5340/Kconfig.board rename boards/arm/{nrf5340_dk_nrf5340 => nrf5340pdk_nrf5340}/CMakeLists.txt (68%) rename boards/arm/{nrf5340_dk_nrf5340 => nrf5340pdk_nrf5340}/Kconfig (84%) create mode 100644 boards/arm/nrf5340pdk_nrf5340/Kconfig.board rename boards/arm/{nrf5340_dk_nrf5340 => nrf5340pdk_nrf5340}/Kconfig.defconfig (77%) rename boards/arm/{nrf5340_dk_nrf5340 => nrf5340pdk_nrf5340}/board.cmake (75%) rename boards/arm/{nrf5340_dk_nrf5340/doc/img/nrf5340_dk.png => nrf5340pdk_nrf5340/doc/img/nrf5340pdk.png} (100%) rename boards/arm/{nrf5340_dk_nrf5340 => nrf5340pdk_nrf5340}/doc/index.rst (87%) rename boards/arm/{nrf5340_dk_nrf5340 => nrf5340pdk_nrf5340}/nrf5340_cpunet_reset.c (96%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.dts => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts} (72%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.yaml => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml} (61%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_common.dts => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_common.dts} (92%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_defconfig => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig} (88%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_partition_conf.dts => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_partition_conf.dts} (83%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.dts => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts} (69%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.yaml => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml} (57%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns_defconfig => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig} (90%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.dts => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts} (90%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.yaml => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml} (59%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet_defconfig => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig} (86%) rename boards/arm/{nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_shared_sram_planning_conf.dts => nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_shared_sram_planning_conf.dts} (100%) rename samples/bluetooth/hci_uart/boards/{nrf5340_dk_nrf5340_cpuapp.overlay => nrf5340pdk_nrf5340_cpuapp.overlay} (100%) diff --git a/boards/arm/nrf5340_dk_nrf5340/Kconfig.board b/boards/arm/nrf5340_dk_nrf5340/Kconfig.board deleted file mode 100644 index 2d9b8cff241..00000000000 --- a/boards/arm/nrf5340_dk_nrf5340/Kconfig.board +++ /dev/null @@ -1,18 +0,0 @@ -# nRF5340 DK NRF5340 board configuration - -# Copyright (c) 2019 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF5340_DK_NRF5340_CPUAPP - bool "nRF5340 DK nRF5340 Application MCU" - -config BOARD_NRF5340_DK_NRF5340_CPUAPPNS - bool "nRF5340 DK nRF5340 Application MCU non-secure" - -endif # SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF5340_DK_NRF5340_CPUNET - bool "nRF5340 DK NRF5340 Network MCU" - depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/nrf5340_dk_nrf5340/CMakeLists.txt b/boards/arm/nrf5340pdk_nrf5340/CMakeLists.txt similarity index 68% rename from boards/arm/nrf5340_dk_nrf5340/CMakeLists.txt rename to boards/arm/nrf5340pdk_nrf5340/CMakeLists.txt index f4f568ed212..8a7937720ce 100644 --- a/boards/arm/nrf5340_dk_nrf5340/CMakeLists.txt +++ b/boards/arm/nrf5340pdk_nrf5340/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2019 Nordic Semiconductor ASA. # SPDX-License-Identifier: Apache-2.0 -if ((CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPPNS) +if ((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) AND CONFIG_BOARD_ENABLE_CPUNET) zephyr_library() zephyr_library_sources(nrf5340_cpunet_reset.c) diff --git a/boards/arm/nrf5340_dk_nrf5340/Kconfig b/boards/arm/nrf5340pdk_nrf5340/Kconfig similarity index 84% rename from boards/arm/nrf5340_dk_nrf5340/Kconfig rename to boards/arm/nrf5340pdk_nrf5340/Kconfig index 40cdec41c3a..790ee0d574d 100644 --- a/boards/arm/nrf5340_dk_nrf5340/Kconfig +++ b/boards/arm/nrf5340pdk_nrf5340/Kconfig @@ -1,9 +1,9 @@ -# nRF5340 DK NRF5340 board configuration +# nRF5340 PDK board configuration # Copyright (c) 2019 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPPNS +if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS config BOARD_ENABLE_DCDC_APP bool "Enable Application MCU DCDC converter" @@ -43,9 +43,9 @@ config BOARD_ENABLE_CPUNET may already have started the Network MCU. default y if (BT || NET_L2_IEEE802154) -endif # BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPPNS +endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS -if BOARD_NRF5340_DK_NRF5340_CPUNET +if BOARD_NRF5340PDK_NRF5340_CPUNET # BT_CTLR depends on BT. When BT is enabled we should default to also # enabling the controller. @@ -55,4 +55,4 @@ config BT_CTLR config BT_ECC default y if BT -endif # BOARD_NRF5340_DK_NRF5340_CPUNET +endif # BOARD_NRF5340PDK_NRF5340_CPUNET diff --git a/boards/arm/nrf5340pdk_nrf5340/Kconfig.board b/boards/arm/nrf5340pdk_nrf5340/Kconfig.board new file mode 100644 index 00000000000..9695483a283 --- /dev/null +++ b/boards/arm/nrf5340pdk_nrf5340/Kconfig.board @@ -0,0 +1,18 @@ +# nRF5340 PDK NRF5340 board configuration + +# Copyright (c) 2019-2020 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +if SOC_NRF5340_CPUAPP_QKAA + +config BOARD_NRF5340PDK_NRF5340_CPUAPP + bool "nRF5340 PDK nRF5340 Application MCU" + +config BOARD_NRF5340PDK_NRF5340_CPUAPPNS + bool "nRF5340 PDK nRF5340 Application MCU non-secure" + +endif # SOC_NRF5340_CPUAPP_QKAA + +config BOARD_NRF5340PDK_NRF5340_CPUNET + bool "nRF5340 PDK NRF5340 Network MCU" + depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/nrf5340_dk_nrf5340/Kconfig.defconfig b/boards/arm/nrf5340pdk_nrf5340/Kconfig.defconfig similarity index 77% rename from boards/arm/nrf5340_dk_nrf5340/Kconfig.defconfig rename to boards/arm/nrf5340pdk_nrf5340/Kconfig.defconfig index 29960f99fb8..d9ae5cfa43e 100644 --- a/boards/arm/nrf5340_dk_nrf5340/Kconfig.defconfig +++ b/boards/arm/nrf5340pdk_nrf5340/Kconfig.defconfig @@ -1,12 +1,12 @@ -# nRF5340 DK nRF5340 board configuration +# nRF5340 PDK nRF5340 board configuration -# Copyright (c) 2019 Nordic Semiconductor ASA +# Copyright (c) 2019-2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPPNS +if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS config BOARD - default "nrf5340_dk_nrf5340_cpuapp" + default "nrf5340pdk_nrf5340_cpuapp" config ADC_0 default y @@ -44,7 +44,7 @@ config PWM_0 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition -if BOARD_NRF5340_DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE +if BOARD_NRF5340PDK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -52,9 +52,9 @@ config FLASH_LOAD_SIZE config SRAM_SIZE default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K) -endif # BOARD_NRF5340_DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE +endif # BOARD_NRF5340PDK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE -if BOARD_NRF5340_DK_NRF5340_CPUAPPNS +if BOARD_NRF5340PDK_NRF5340_CPUAPPNS config FLASH_LOAD_OFFSET default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -62,10 +62,10 @@ config FLASH_LOAD_OFFSET config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) -endif # BOARD_NRF5340_DK_NRF5340_CPUAPPNS +endif # BOARD_NRF5340PDK_NRF5340_CPUAPPNS -endif # BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPPNS +endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS config BOARD - default "nrf5340_dk_nrf5340_cpunet" - depends on BOARD_NRF5340_DK_NRF5340_CPUNET + default "nrf5340pdk_nrf5340_cpunet" + depends on BOARD_NRF5340PDK_NRF5340_CPUNET diff --git a/boards/arm/nrf5340_dk_nrf5340/board.cmake b/boards/arm/nrf5340pdk_nrf5340/board.cmake similarity index 75% rename from boards/arm/nrf5340_dk_nrf5340/board.cmake rename to boards/arm/nrf5340pdk_nrf5340/board.cmake index 82aa8f32cb4..5ef6648bddd 100644 --- a/boards/arm/nrf5340_dk_nrf5340/board.cmake +++ b/boards/arm/nrf5340pdk_nrf5340/board.cmake @@ -1,12 +1,11 @@ # SPDX-License-Identifier: Apache-2.0 - -if(CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPPNS) +if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) board_runner_args(nrfjprog "--nrf-family=NRF53" "--tool-opt=--coprocessor CP_APPLICATION") board_runner_args(jlink "--device=cortex-m33" "--speed=4000") endif() -if(CONFIG_BOARD_NRF5340_DK_NRF5340_CPUNET) +if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET) board_runner_args(nrfjprog "--nrf-family=NRF53" "--tool-opt=--coprocessor CP_NETWORK") endif() diff --git a/boards/arm/nrf5340_dk_nrf5340/doc/img/nrf5340_dk.png b/boards/arm/nrf5340pdk_nrf5340/doc/img/nrf5340pdk.png similarity index 100% rename from boards/arm/nrf5340_dk_nrf5340/doc/img/nrf5340_dk.png rename to boards/arm/nrf5340pdk_nrf5340/doc/img/nrf5340pdk.png diff --git a/boards/arm/nrf5340_dk_nrf5340/doc/index.rst b/boards/arm/nrf5340pdk_nrf5340/doc/index.rst similarity index 87% rename from boards/arm/nrf5340_dk_nrf5340/doc/index.rst rename to boards/arm/nrf5340pdk_nrf5340/doc/index.rst index 5e5bbfce57f..6cdb586eb1e 100644 --- a/boards/arm/nrf5340_dk_nrf5340/doc/index.rst +++ b/boards/arm/nrf5340pdk_nrf5340/doc/index.rst @@ -1,12 +1,12 @@ -.. _nrf5340_dk_nrf5340: +.. _nrf5340pdk_nrf5340: -nRF5340-DK -########## +nRF5340 PDK +########### Overview ******** -The nRF5340 DK is a single-board development kit for evaluation +The nRF5340 PDK (PCA10095) is a single-board development kit for evaluation and development on the Nordic nRF5340 System-on-Chip (SoC). The nRF5340 is a dual-core SoC based on the Arm® Cortex®-M33 architecture, with: @@ -17,8 +17,8 @@ The nRF5340 is a dual-core SoC based on the Arm® Cortex®-M33 architecture, wit * a secondary ARM Cortex-M33 core, with a reduced feature set, running at a fixed 64 MHz, referred to as the **Network MCU**. -The nrf5340_dk_nrf5340_cpuapp provides support for the Application MCU on -nRF5340 SoC. The nrf5340_dn_nrf5340_cpunet provides support for the Network +The nrf5340pdk_nrf5340_cpuapp provides support for the Application MCU on +nRF5340 SoC. The nrf5340pdk_nrf5340_cpunet provides support for the Network MCU on nRF5340 SoC. nRF5340 SoC provides support for the following devices: @@ -40,29 +40,33 @@ nRF5340 SoC provides support for the following devices: * :abbr:`USB (Universal Serial Bus)` * :abbr:`WDT (Watchdog Timer)` -.. figure:: img/nrf5340_dk.png +.. figure:: img/nrf5340pdk.png :width: 711px :align: center - :alt: nRF5340 DK + :alt: nRF5340 PDK - nRF5340 DK (Credit: Nordic Semiconductor) + nRF5340 PDK (Credit: Nordic Semiconductor) More information about the board can be found at the -`nRF5340 DK website`_. +`nRF5340 PDK website`_. The `Nordic Semiconductor Infocenter`_ contains the processor's information and the datasheet. +.. note:: + + In previous Zephyr releases this board was named *nrf5340_dk_nrf5340*. + Hardware ******** -nRF5340 DK has two external oscillators. The frequency of +nRF5340 PDK 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 nrf5340_dk_nrf5340_cpuapp board configuration supports the following +The nrf5340pdk_nrf5340_cpuapp board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -99,7 +103,7 @@ hardware features: | WDT | on-chip | watchdog | +-----------+------------+----------------------+ -The nrf5340_dk_nrf5340_cpunet board configuration supports the following +The nrf5340pdk_nrf5340_cpunet board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -173,7 +177,7 @@ Programming and Debugging ************************* nRF5340 Application MCU supports the Armv8m Security Extension. -Applications build for the nrf5340_dk_nrf5340_cpuapp board by default +Applications build for the nrf5340pdk_nrf5340_cpuapp board by default boot in the Secure state. nRF5340 Network MCU does not support the Armv8m Security Extension. @@ -187,14 +191,14 @@ Building Secure/Non-Secure Zephyr applications The process requires the following steps: 1. Build the Secure Zephyr application for the Application MCU - using ``-DBOARD=nrf5340_dk_nrf5340_cpuapp`` and + using ``-DBOARD=nrf5340pdk_nrf5340_cpuapp`` and ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the application project configuration file. 2. Build the Non-Secure Zephyr application for the Application MCU - using ``-DBOARD=nrf5340_dk_nrf5340_cpuappns``. + using ``-DBOARD=nrf5340pdk_nrf5340_cpuappns``. 3. Merge the two binaries together. 4. Build the application firmware for the Network MCU using - ``-DBOARD=nrf5340_dk_nrf5340_cpunet``. + ``-DBOARD=nrf5340pdk_nrf5340_cpunet``. When building a Secure/Non-Secure application for the nRF5340 Application MCU, the Secure application will have to set the IDAU (SPU) configuration to allow @@ -206,9 +210,9 @@ Building a Secure only application ================================== Build the Zephyr app in the usual way (see :ref:`build_an_application` -and :ref:`application_run`), using ``-DBOARD=nrf5340_dk_nrf5340_cpuapp`` for +and :ref:`application_run`), using ``-DBOARD=nrf5340pdk_nrf5340_cpuapp`` for the firmware running on the nRF5340 Application MCU, and using -``-DBOARD=nrf5340_dk_nrf5340_cpunet`` for the firmware running +``-DBOARD=nrf5340pdk_nrf5340_cpunet`` for the firmware running on the nRF5340 Network MCU. Flashing @@ -229,14 +233,14 @@ First, run your favorite terminal program to listen for output. $ minicom -D -b 115200 -Replace :code:`` with the port where the board nRF5340 DK +Replace :code:`` with the port where the board nRF5340 PDK can be found. For example, under Linux, :code:`/dev/ttyACM0`. Then build and flash the application in the usual way. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf5340_dk_nrf5340_cpuapp + :board: nrf5340pdk_nrf5340_cpuapp :goals: build flash Debugging @@ -246,8 +250,8 @@ Refer to the :ref:`nordic_segger` page to learn about debugging Nordic boards with a Segger IC. -Testing the LEDs and buttons in the nRF5340 DK -********************************************** +Testing the LEDs and buttons in the nRF5340 PDK +*********************************************** There are 2 samples that allow you to test that the buttons (switches) and LEDs on the board are working properly with Zephyr: @@ -257,7 +261,7 @@ LEDs on 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/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_common.dts`. +:zephyr_file:`boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_common.dts`. References ********** @@ -266,6 +270,6 @@ References .. _IDAU: https://developer.arm.com/docs/100690/latest/attribution-units-sau-and-idau -.. _nRF5340 DK website: +.. _nRF5340 PDK website: https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK .. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_cpunet_reset.c b/boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c similarity index 96% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_cpunet_reset.c rename to boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c index f67793bf222..46b7180a1e4 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_cpunet_reset.c +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c @@ -10,7 +10,7 @@ #include -LOG_MODULE_REGISTER(nrf5340_dk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL); +LOG_MODULE_REGISTER(nrf5340pdk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL); #if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.dts b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts similarity index 72% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.dts rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts index 4de16d71e9b..e64584c71d9 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.dts +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2019 Nordic Semiconductor ASA + * Copyright (c) 2019-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ /dts-v1/; #include -#include "nrf5340_dk_nrf5340_cpuapp_common.dts" +#include "nrf5340pdk_nrf5340_cpuapp_common.dts" / { chosen { diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.yaml b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml similarity index 61% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.yaml rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml index 7f805574970..fb2d2660653 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.yaml +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml @@ -1,5 +1,5 @@ -identifier: nrf5340_dk_nrf5340_cpuapp -name: NRF5340-DK-NRF5340-application-MCU +identifier: nrf5340pdk_nrf5340_cpuapp +name: NRF5340-PDK-NRF5340-application-MCU type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_common.dts b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_common.dts similarity index 92% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_common.dts rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_common.dts index c5adc21b45f..41164f004d7 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_common.dts +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_common.dts @@ -1,13 +1,13 @@ /* - * Copyright (c) 2019 Nordic Semiconductor ASA + * Copyright (c) 2019-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ / { - model = "Nordic NRF5340 Dev Kit"; - compatible = "nordic,nrf5340-dk", "nordic,nrf5340-cpuapp-qkaa", - "nordic,nrf5340-cpuapp"; + model = "Nordic NRF5340 PDK NRF5340 Application"; + compatible = "nordic,nrf5340-pdk-nrf5340-cpuapp", + "nordic,nrf5340-cpuapp-qkaa", "nordic,nrf5340-cpuapp"; chosen { zephyr,console = &uart0; @@ -184,4 +184,4 @@ }; /* Include partition configuration file */ -#include "nrf5340_dk_nrf5340_cpuapp_partition_conf.dts" +#include "nrf5340pdk_nrf5340_cpuapp_partition_conf.dts" diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_defconfig b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig similarity index 88% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_defconfig rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig index 038dcbc31ea..430a0dfb40c 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_defconfig +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF53X=y CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPP=y +CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_partition_conf.dts b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_partition_conf.dts similarity index 83% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_partition_conf.dts rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_partition_conf.dts index e30de43b4a6..f42697e6e68 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_partition_conf.dts +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_partition_conf.dts @@ -1,11 +1,11 @@ /* - * Copyright (c) 2019 Nordic Semiconductor ASA + * Copyright (c) 2019-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ /* - * Default Flash planning for nrf5340_dk_nrf5340 CPUAPP (Application MCU). + * Default Flash planning for nrf5340pdk_nrf5340 CPUAPP (Application MCU). * * Zephyr build for nRF5340 with ARM TrustZone-M support, * implies building Secure and Non-Secure Zephyr images. @@ -42,7 +42,7 @@ * - Lowest 64 kB SRAM allocated to Secure image (sram0_s) * - Middle 384 kB allocated to Non-Secure image (sram0_ns) * - Upper 64 kB SRAM allocated as Shared memory (sram0_shared) - * (see nrf5340_dk_nrf5340_shared_sram_planning_conf.dts) + * (see nrf5340pdk_nrf5340_shared_sram_planning_conf.dts) */ &sram0 { reg = <0x20000000 DT_SIZE_K(448)>; @@ -57,4 +57,4 @@ }; /* Include shared RAM configuration file */ -#include "nrf5340_dk_nrf5340_shared_sram_planning_conf.dts" +#include "nrf5340pdk_nrf5340_shared_sram_planning_conf.dts" diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.dts b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts similarity index 69% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.dts rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts index 930ab44e9cf..af4a0fb9c3c 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.dts +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts @@ -1,12 +1,12 @@ /* - * Copyright (c) 2019 Nordic Semiconductor ASA + * Copyright (c) 2019-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ /dts-v1/; #include -#include "nrf5340_dk_nrf5340_cpuapp_common.dts" +#include "nrf5340pdk_nrf5340_cpuapp_common.dts" / { chosen { diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.yaml b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml similarity index 57% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.yaml rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml index eed1f99cf88..ddf4547455d 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.yaml +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml @@ -1,5 +1,5 @@ -identifier: nrf5340_dk_nrf5340_cpuappns -name: NRF5340-DK-NRF5340-application-MCU-Non-Secure +identifier: nrf5340pdk_nrf5340_cpuappns +name: NRF5340-PDK-NRF5340-application-MCU-Non-Secure type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns_defconfig b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig similarity index 90% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns_defconfig rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig index b2cfee97b4f..8f30acd0a78 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns_defconfig +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF53X=y CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPPNS=y +CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.dts b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts similarity index 90% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.dts rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts index 8ebdd2e3b39..e513e3e3968 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.dts +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Nordic Semiconductor ASA + * Copyright (c) 2019-2020 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ @@ -8,9 +8,9 @@ #include / { - model = "Nordic NRF5340 Dev Kit Network"; - compatible = "nordic,nrf5340-dk","nordic,nrf5340-cpunet-qkaa", - "nordic,nrf5340-cpunet"; + model = "Nordic NRF5340 PDK NRF5340 Network"; + compatible = "nordic,nrf5340-pdk-nrf5340-cpunet", + "nordic,nrf5340-cpunet-qkaa", "nordic,nrf5340-cpunet"; chosen { zephyr,console = &uart0; @@ -143,4 +143,4 @@ }; /* Include shared RAM configuration file */ -#include "nrf5340_dk_nrf5340_shared_sram_planning_conf.dts" +#include "nrf5340pdk_nrf5340_shared_sram_planning_conf.dts" diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.yaml b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml similarity index 59% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.yaml rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml index 8198ee91865..ce5c34346a5 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.yaml +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml @@ -1,5 +1,5 @@ -identifier: nrf5340_dk_nrf5340_cpunet -name: NRF5340-DK-NRF5340-network-MCU +identifier: nrf5340pdk_nrf5340_cpunet +name: NRF5340-PDK-NRF5340-network-MCU type: mcu arch: arm toolchain: diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet_defconfig b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig similarity index 86% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet_defconfig rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig index ed8cfea4987..2965fd90ab0 100644 --- a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet_defconfig +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF53X=y CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_NRF5340_DK_NRF5340_CPUNET=y +CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_shared_sram_planning_conf.dts b/boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_shared_sram_planning_conf.dts similarity index 100% rename from boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_shared_sram_planning_conf.dts rename to boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_shared_sram_planning_conf.dts diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig index 95279e67fc7..9f262a8229a 100644 --- a/drivers/bluetooth/hci/Kconfig +++ b/drivers/bluetooth/hci/Kconfig @@ -101,7 +101,7 @@ endif # BT_SPI config BT_RPMSG_NRF53 bool "nRF53 configuration of RPMsg" - default y if (BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPPNS) + default y if (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS) depends on BT_RPMSG select IPM select IPM_NRFX diff --git a/samples/bluetooth/hci_rpmsg/sample.yaml b/samples/bluetooth/hci_rpmsg/sample.yaml index abf80172eeb..e8d47f897ac 100644 --- a/samples/bluetooth/hci_rpmsg/sample.yaml +++ b/samples/bluetooth/hci_rpmsg/sample.yaml @@ -5,5 +5,5 @@ sample: tests: sample.bluetooth.hci_rpmsg: harness: bluetooth - platform_whitelist: nrf5340_dk_nrf5340_cpunet + platform_whitelist: nrf5340pdk_nrf5340_cpunet tags: bluetooth diff --git a/samples/bluetooth/hci_uart/boards/nrf5340_dk_nrf5340_cpuapp.overlay b/samples/bluetooth/hci_uart/boards/nrf5340pdk_nrf5340_cpuapp.overlay similarity index 100% rename from samples/bluetooth/hci_uart/boards/nrf5340_dk_nrf5340_cpuapp.overlay rename to samples/bluetooth/hci_uart/boards/nrf5340pdk_nrf5340_cpuapp.overlay