michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: arm: nrf5340_dk_nrf5340: rename target to nrf5340pdk_nrf5340

Browse source 
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 <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2020-04-03 16:58:27 +02:00 • committed by Carles Cufí
commit 88bf06bb01
24 changed files with 96 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

18
boards/arm/nrf5340_dk_nrf5340/Kconfig.board
View file

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

2
boards/arm/nrf5340_dk_nrf5340/CMakeLists.txt → boards/arm/nrf5340pdk_nrf5340/CMakeLists.txt
View file

@ -1,7 +1,7 @@
# Copyright (c) 2019 Nordic Semiconductor ASA. # Copyright (c) 2019 Nordic Semiconductor ASA.
# SPDX-License-Identifier: Apache-2.0 # 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) AND CONFIG_BOARD_ENABLE_CPUNET)
zephyr_library() zephyr_library()
zephyr_library_sources(nrf5340_cpunet_reset.c) zephyr_library_sources(nrf5340_cpunet_reset.c)

10
boards/arm/nrf5340_dk_nrf5340/Kconfig → boards/arm/nrf5340pdk_nrf5340/Kconfig
View file

@ -1,9 +1,9 @@
# nRF5340 DK NRF5340 board configuration # nRF5340 PDK board configuration
# Copyright (c) 2019 Nordic Semiconductor ASA # Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0 # 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 config BOARD_ENABLE_DCDC_APP
bool "Enable Application MCU DCDC converter" bool "Enable Application MCU DCDC converter"
@ -43,9 +43,9 @@ config BOARD_ENABLE_CPUNET
may already have started the Network MCU. may already have started the Network MCU.
default y if (BT || NET_L2_IEEE802154) 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 # BT_CTLR depends on BT. When BT is enabled we should default to also
# enabling the controller. # enabling the controller.
@ -55,4 +55,4 @@ config BT_CTLR
config BT_ECC config BT_ECC
default y if BT default y if BT
endif # BOARD_NRF5340_DK_NRF5340_CPUNET endif # BOARD_NRF5340PDK_NRF5340_CPUNET

18
boards/arm/nrf5340pdk_nrf5340/Kconfig.board Normal file
View file

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

22
boards/arm/nrf5340_dk_nrf5340/Kconfig.defconfig → boards/arm/nrf5340pdk_nrf5340/Kconfig.defconfig
View file

@ -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 # 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 config BOARD
default "nrf5340_dk_nrf5340_cpuapp" default "nrf5340pdk_nrf5340_cpuapp"
config ADC_0 config ADC_0
default y default y
@ -44,7 +44,7 @@ config PWM_0
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-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 config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@ -52,9 +52,9 @@ config FLASH_LOAD_SIZE
config SRAM_SIZE config SRAM_SIZE
default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K) 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 config FLASH_LOAD_OFFSET
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@ -62,10 +62,10 @@ config FLASH_LOAD_OFFSET
config FLASH_LOAD_SIZE config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) 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 config BOARD
default "nrf5340_dk_nrf5340_cpunet" default "nrf5340pdk_nrf5340_cpunet"
depends on BOARD_NRF5340_DK_NRF5340_CPUNET depends on BOARD_NRF5340PDK_NRF5340_CPUNET

5
boards/arm/nrf5340_dk_nrf5340/board.cmake → boards/arm/nrf5340pdk_nrf5340/board.cmake
View file

@ -1,12 +1,11 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)
if(CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPPNS)
board_runner_args(nrfjprog "--nrf-family=NRF53" "--tool-opt=--coprocessor CP_APPLICATION") board_runner_args(nrfjprog "--nrf-family=NRF53" "--tool-opt=--coprocessor CP_APPLICATION")
board_runner_args(jlink "--device=cortex-m33" "--speed=4000") board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
endif() 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") board_runner_args(nrfjprog "--nrf-family=NRF53" "--tool-opt=--coprocessor CP_NETWORK")
endif() endif()

0
boards/arm/nrf5340_dk_nrf5340/doc/img/nrf5340_dk.png → boards/arm/nrf5340pdk_nrf5340/doc/img/nrf5340pdk.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB

Before After
Before After

54
boards/arm/nrf5340_dk_nrf5340/doc/index.rst → boards/arm/nrf5340pdk_nrf5340/doc/index.rst
View file

@ -1,12 +1,12 @@
.. _nrf5340_dk_nrf5340: .. _nrf5340pdk_nrf5340:
nRF5340-DK nRF5340 PDK
########## ###########
Overview 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). 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: 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 secondary ARM Cortex-M33 core, with a reduced feature set, running at
a fixed 64 MHz, referred to as the **Network MCU**. a fixed 64 MHz, referred to as the **Network MCU**.
The nrf5340_dk_nrf5340_cpuapp provides support for the Application MCU on The nrf5340pdk_nrf5340_cpuapp provides support for the Application MCU on
nRF5340 SoC. The nrf5340_dn_nrf5340_cpunet provides support for the Network nRF5340 SoC. The nrf5340pdk_nrf5340_cpunet provides support for the Network
MCU on nRF5340 SoC. MCU on nRF5340 SoC.
nRF5340 SoC provides support for the following devices: 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:`USB (Universal Serial Bus)`
* :abbr:`WDT (Watchdog Timer)` * :abbr:`WDT (Watchdog Timer)`
.. figure:: img/nrf5340_dk.png .. figure:: img/nrf5340pdk.png
:width: 711px :width: 711px
:align: center :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 More information about the board can be found at the
`nRF5340 DK website`_. `nRF5340 PDK website`_.
The `Nordic Semiconductor Infocenter`_ The `Nordic Semiconductor Infocenter`_
contains the processor's information and the datasheet. contains the processor's information and the datasheet.
.. note::
In previous Zephyr releases this board was named *nrf5340_dk_nrf5340*.
Hardware 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 the slow clock is 32.768 kHz. The frequency of the main clock
is 32 MHz. is 32 MHz.
Supported Features Supported Features
================== ==================
The nrf5340_dk_nrf5340_cpuapp board configuration supports the following The nrf5340pdk_nrf5340_cpuapp board configuration supports the following
hardware features: hardware features:
+-----------+------------+----------------------+ +-----------+------------+----------------------+
@ -99,7 +103,7 @@ hardware features:
| WDT | on-chip | watchdog | | 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: hardware features:
+-----------+------------+----------------------+ +-----------+------------+----------------------+
@ -173,7 +177,7 @@ Programming and Debugging
************************* *************************
nRF5340 Application MCU supports the Armv8m Security Extension. 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. boot in the Secure state.
nRF5340 Network MCU does not support the Armv8m Security Extension. 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: The process requires the following steps:
1. Build the Secure Zephyr application for the Application MCU 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 ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the application
project configuration file. project configuration file.
2. Build the Non-Secure Zephyr application for the Application MCU 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. 3. Merge the two binaries together.
4. Build the application firmware for the Network MCU using 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, 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 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` 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 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. on the nRF5340 Network MCU.
Flashing Flashing
@ -229,14 +233,14 @@ First, run your favorite terminal program to listen for output.
$ minicom -D <tty_device> -b 115200 $ minicom -D <tty_device> -b 115200
Replace :code:`<tty_device>` with the port where the board nRF5340 DK Replace :code:`<tty_device>` with the port where the board nRF5340 PDK
can be found. For example, under Linux, :code:`/dev/ttyACM0`. can be found. For example, under Linux, :code:`/dev/ttyACM0`.
Then build and flash the application in the usual way. Then build and flash the application in the usual way.
.. zephyr-app-commands:: .. zephyr-app-commands::
:zephyr-app: samples/hello_world :zephyr-app: samples/hello_world
:board: nrf5340_dk_nrf5340_cpuapp :board: nrf5340pdk_nrf5340_cpuapp
:goals: build flash :goals: build flash
Debugging Debugging
@ -246,8 +250,8 @@ Refer to the :ref:`nordic_segger` page to learn about debugging Nordic
boards with a Segger IC. 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 There are 2 samples that allow you to test that the buttons (switches) and
LEDs on the board are working properly with Zephyr: 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 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 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 References
********** **********
@ -266,6 +270,6 @@ References
.. _IDAU: .. _IDAU:
https://developer.arm.com/docs/100690/latest/attribution-units-sau-and-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 https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK
.. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com .. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com

2
boards/arm/nrf5340_dk_nrf5340/nrf5340_cpunet_reset.c → boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c
View file

@ -10,7 +10,7 @@
#include <soc.h> #include <soc.h>
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) #if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)

4
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.dts → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts
View file

@ -1,12 +1,12 @@
/* /*
* Copyright (c) 2019 Nordic Semiconductor ASA * Copyright (c) 2019-2020 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
/dts-v1/; /dts-v1/;
#include <nordic/nrf5340_cpuapp_qkaa.dtsi> #include <nordic/nrf5340_cpuapp_qkaa.dtsi>
#include "nrf5340_dk_nrf5340_cpuapp_common.dts" #include "nrf5340pdk_nrf5340_cpuapp_common.dts"
/ { / {
chosen { chosen {

4
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp.yaml → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml
View file

@ -1,5 +1,5 @@
identifier: nrf5340_dk_nrf5340_cpuapp identifier: nrf5340pdk_nrf5340_cpuapp
name: NRF5340-DK-NRF5340-application-MCU name: NRF5340-PDK-NRF5340-application-MCU
type: mcu type: mcu
arch: arm arch: arm
toolchain: toolchain:

10
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_common.dts → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_common.dts
View file

@ -1,13 +1,13 @@
/* /*
* Copyright (c) 2019 Nordic Semiconductor ASA * Copyright (c) 2019-2020 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
/ { / {
model = "Nordic NRF5340 Dev Kit"; model = "Nordic NRF5340 PDK NRF5340 Application";
compatible = "nordic,nrf5340-dk", "nordic,nrf5340-cpuapp-qkaa", compatible = "nordic,nrf5340-pdk-nrf5340-cpuapp",
"nordic,nrf5340-cpuapp"; "nordic,nrf5340-cpuapp-qkaa", "nordic,nrf5340-cpuapp";
chosen { chosen {
zephyr,console = &uart0; zephyr,console = &uart0;
@ -184,4 +184,4 @@
}; };
/* Include partition configuration file */ /* Include partition configuration file */
#include "nrf5340_dk_nrf5340_cpuapp_partition_conf.dts" #include "nrf5340pdk_nrf5340_cpuapp_partition_conf.dts"

2
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_defconfig → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig
View file

@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF53X=y CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPP=y CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y

8
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuapp_partition_conf.dts → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_partition_conf.dts
View file

@ -1,11 +1,11 @@
/* /*
* Copyright (c) 2019 Nordic Semiconductor ASA * Copyright (c) 2019-2020 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * 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, * Zephyr build for nRF5340 with ARM TrustZone-M support,
* implies building Secure and Non-Secure Zephyr images. * implies building Secure and Non-Secure Zephyr images.
@ -42,7 +42,7 @@
* - Lowest 64 kB SRAM allocated to Secure image (sram0_s) * - Lowest 64 kB SRAM allocated to Secure image (sram0_s)
* - Middle 384 kB allocated to Non-Secure image (sram0_ns) * - Middle 384 kB allocated to Non-Secure image (sram0_ns)
* - Upper 64 kB SRAM allocated as Shared memory (sram0_shared) * - 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 { &sram0 {
reg = <0x20000000 DT_SIZE_K(448)>; reg = <0x20000000 DT_SIZE_K(448)>;
@ -57,4 +57,4 @@
}; };
/* Include shared RAM configuration file */ /* Include shared RAM configuration file */
#include "nrf5340_dk_nrf5340_shared_sram_planning_conf.dts" #include "nrf5340pdk_nrf5340_shared_sram_planning_conf.dts"

4
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.dts → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts
View file

@ -1,12 +1,12 @@
/* /*
* Copyright (c) 2019 Nordic Semiconductor ASA * Copyright (c) 2019-2020 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
/dts-v1/; /dts-v1/;
#include <nordic/nrf5340_cpuappns_qkaa.dtsi> #include <nordic/nrf5340_cpuappns_qkaa.dtsi>
#include "nrf5340_dk_nrf5340_cpuapp_common.dts" #include "nrf5340pdk_nrf5340_cpuapp_common.dts"
/ { / {
chosen { chosen {

4
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns.yaml → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml
View file

@ -1,5 +1,5 @@
identifier: nrf5340_dk_nrf5340_cpuappns identifier: nrf5340pdk_nrf5340_cpuappns
name: NRF5340-DK-NRF5340-application-MCU-Non-Secure name: NRF5340-PDK-NRF5340-application-MCU-Non-Secure
type: mcu type: mcu
arch: arm arch: arm
toolchain: toolchain:

2
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpuappns_defconfig → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig
View file

@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF53X=y CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_NRF5340_DK_NRF5340_CPUAPPNS=y CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y

10
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.dts → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019 Nordic Semiconductor ASA * Copyright (c) 2019-2020 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -8,9 +8,9 @@
#include <nordic/nrf5340_cpunet_qkaa.dtsi> #include <nordic/nrf5340_cpunet_qkaa.dtsi>
/ { / {
model = "Nordic NRF5340 Dev Kit Network"; model = "Nordic NRF5340 PDK NRF5340 Network";
compatible = "nordic,nrf5340-dk","nordic,nrf5340-cpunet-qkaa", compatible = "nordic,nrf5340-pdk-nrf5340-cpunet",
"nordic,nrf5340-cpunet"; "nordic,nrf5340-cpunet-qkaa", "nordic,nrf5340-cpunet";
chosen { chosen {
zephyr,console = &uart0; zephyr,console = &uart0;
@ -143,4 +143,4 @@
}; };
/* Include shared RAM configuration file */ /* Include shared RAM configuration file */
#include "nrf5340_dk_nrf5340_shared_sram_planning_conf.dts" #include "nrf5340pdk_nrf5340_shared_sram_planning_conf.dts"

4
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet.yaml → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml
View file

@ -1,5 +1,5 @@
identifier: nrf5340_dk_nrf5340_cpunet identifier: nrf5340pdk_nrf5340_cpunet
name: NRF5340-DK-NRF5340-network-MCU name: NRF5340-PDK-NRF5340-network-MCU
type: mcu type: mcu
arch: arm arch: arm
toolchain: toolchain:

2
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_cpunet_defconfig → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig
View file

@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF53X=y CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUNET_QKAA=y CONFIG_SOC_NRF5340_CPUNET_QKAA=y
CONFIG_BOARD_NRF5340_DK_NRF5340_CPUNET=y CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y

0
boards/arm/nrf5340_dk_nrf5340/nrf5340_dk_nrf5340_shared_sram_planning_conf.dts → boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_shared_sram_planning_conf.dts
View file

2
drivers/bluetooth/hci/Kconfig
View file

@ -101,7 +101,7 @@ endif # BT_SPI
config BT_RPMSG_NRF53 config BT_RPMSG_NRF53
bool "nRF53 configuration of RPMsg" 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 depends on BT_RPMSG
select IPM select IPM
select IPM_NRFX select IPM_NRFX

2
samples/bluetooth/hci_rpmsg/sample.yaml
View file

@ -5,5 +5,5 @@ sample:
tests: tests:
sample.bluetooth.hci_rpmsg: sample.bluetooth.hci_rpmsg:
harness: bluetooth harness: bluetooth
platform_whitelist: nrf5340_dk_nrf5340_cpunet platform_whitelist: nrf5340pdk_nrf5340_cpunet
tags: bluetooth tags: bluetooth

0
samples/bluetooth/hci_uart/boards/nrf5340_dk_nrf5340_cpuapp.overlay → samples/bluetooth/hci_uart/boards/nrf5340pdk_nrf5340_cpuapp.overlay
View file