Skip to content

nRF5340 PDK removal from the tree #32231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 15, 2021
Merged

nRF5340 PDK removal from the tree #32231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4da45fe
boards: nrf: remove support for deprecated board nRF5340 PDK
ioannisg Feb 11, 2021
4c63629
boards: nrf5340: update web-page link for nRF5340 DK
ioannisg Feb 11, 2021
15c0e22
tests: remove nrf5340 PDK boards from test .yml files
ioannisg Feb 11, 2021
3185ca8
modules: tf-m: remove nRF5340 PDK from the supported TF-M targets
ioannisg Feb 11, 2021
55d9f2e
bluetooth: controller: remove support for nRF5340 PDK
ioannisg Feb 12, 2021
f39cb75
dts: nordic: remove support for deprecated nRF5340 Eng A SoC
ioannisg Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions boards/arm/nrf5340dk_nrf5340/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright (c) 2019 Nordic Semiconductor ASA.
# SPDX-License-Identifier: Apache-2.0

if (((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)
OR (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS))
if ((CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
AND CONFIG_BOARD_ENABLE_CPUNET)
zephyr_library()
zephyr_library_sources(nrf5340_cpunet_reset.c)
Expand Down Expand Up @@ -30,9 +29,7 @@ if (CONFIG_BUILD_WITH_TFM)
set(TFM_PUBLIC_KEY_FORMAT "full")
endif()

if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)
set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340PDK_NRF5340_CPUAPP)
elseif(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340DK_NRF5340_CPUAPP)
endif()

Expand Down
12 changes: 5 additions & 7 deletions boards/arm/nrf5340dk_nrf5340/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# nRF5340 (P)DK board configuration
# nRF5340 DK board configuration

# Copyright (c) 2019 - 2021 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
Expand Down Expand Up @@ -39,7 +39,7 @@ config IPM_MSG_CH_1_RX

endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT

if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS

config BOARD_ENABLE_DCDC_APP
bool "Enable Application MCU DCDC converter"
Expand Down Expand Up @@ -82,7 +82,6 @@ config BOARD_ENABLE_CPUNET

config DOMAIN_CPUNET_BOARD
string
default "nrf5340pdk_nrf5340_cpunet" if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS
default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
depends on BOARD_ENABLE_CPUNET
help
Expand All @@ -91,9 +90,9 @@ config DOMAIN_CPUNET_BOARD
another board. For example hci_rpmsg on the nRF5340_cpunet for
Bluetooth applications.

endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS

if BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET
if BOARD_NRF5340DK_NRF5340_CPUNET

# BT_CTLR depends on BT. When BT is enabled we should default to also
# enabling the controller.
Expand All @@ -105,11 +104,10 @@ config BT_ECC

config DOMAIN_CPUAPP_BOARD
string
default "nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUNET
default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUNET
help
The board which will be used for CPUAPP domain when creating a multi
image application where one or more images should be located on
another board.

endif # BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET
endif # BOARD_NRF5340DK_NRF5340_CPUNET
12 changes: 1 addition & 11 deletions boards/arm/nrf5340dk_nrf5340/Kconfig.board
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
# nRF5340 (P)DK NRF5340 board configuration
# nRF5340 DK 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"

config BOARD_NRF5340DK_NRF5340_CPUAPP
bool "nRF5340 DK nRF5340 Application MCU"

Expand All @@ -19,10 +13,6 @@ config BOARD_NRF5340DK_NRF5340_CPUAPPNS

endif # SOC_NRF5340_CPUAPP_QKAA

config BOARD_NRF5340PDK_NRF5340_CPUNET
bool "nRF5340 PDK NRF5340 Network MCU"
depends on SOC_NRF5340_CPUNET_QKAA

config BOARD_NRF5340DK_NRF5340_CPUNET
bool "nRF5340 DK NRF5340 Network MCU"
depends on SOC_NRF5340_CPUNET_QKAA
25 changes: 8 additions & 17 deletions boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
# nRF5340 (P)DK nRF5340 board configuration
# nRF5340 DK nRF5340 board configuration

# Copyright (c) 2019-2020 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUNET

config BOARD_DEPRECATED_RELEASE
default "v2.6.0"

endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUNET

if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS

config BOARD
default "nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS
default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS

# By default, if we build for a Non-Secure version of the board,
# force building with TF-M as the Secure Execution Environment.

config BUILD_WITH_TFM
default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUAPPNS
default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS

# Code Partition:
#
Expand Down Expand Up @@ -50,25 +42,25 @@ config BUILD_WITH_TFM
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition

if (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE
if BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE

config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))

config SRAM_SIZE
default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)

endif # (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE
endif # BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE

if BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS
if BOARD_NRF5340DK_NRF5340_CPUAPPNS

config FLASH_LOAD_OFFSET
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))

config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))

endif # BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS
endif # BOARD_NRF5340DK_NRF5340_CPUAPPNS

if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB

Expand All @@ -80,8 +72,7 @@ config USB_DEVICE_STACK

endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB

endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS

config BOARD
default "nrf5340pdk_nrf5340_cpunet" if BOARD_NRF5340PDK_NRF5340_CPUNET
default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET
7 changes: 3 additions & 4 deletions boards/arm/nrf5340dk_nrf5340/board.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# SPDX-License-Identifier: Apache-2.0

if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
set(TFM_PUBLIC_KEY_FORMAT "full")
endif()

if((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) OR
(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS))
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
endif()

if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
endif()

Expand Down
8 changes: 1 addition & 7 deletions boards/arm/nrf5340dk_nrf5340/doc/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ More information about the board can be found at the
The `Nordic Semiconductor Infocenter`_
contains the processor's information and the datasheet.

.. note::

nRF5340 PDK (preview development kit) is an earlier version of the
nRF5340 DK. nRF5340 PDK board is deprecated and is replaced by nRF5340 DK.
The support for nRF5340 PDK will be removed in Zephyr v2.6.0 release.


Hardware
********
Expand Down Expand Up @@ -332,6 +326,6 @@ References
.. _IDAU:
https://developer.arm.com/docs/100690/latest/attribution-units-sau-and-idau
.. _nRF5340 DK website:
https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK
https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-DK
.. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com
.. _Trusted Firmware M: https://www.trustedfirmware.org/projects/tf-m/
2 changes: 1 addition & 1 deletion boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_partition_conf.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

/*
* Default Flash planning for nrf5340pdk_nrf5340 CPUAPP (Application MCU).
* Default Flash planning for nrf5340dk_nrf5340 CPUAPP (Application MCU).
*
* Zephyr build for nRF5340 with ARM TrustZone-M support,
* implies building Secure and Non-Secure Zephyr images.
Expand Down
10 changes: 2 additions & 8 deletions boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,12 @@

#include <soc.h>

LOG_MODULE_REGISTER(nrf5340pdk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
LOG_MODULE_REGISTER(nrf5340dk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);

#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)

/* This should come from DTS, possibly an overlay. */
#if defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP)
#define CPUNET_UARTE_PIN_TX 25
#define CPUNET_UARTE_PIN_RX 26
#define CPUNET_UARTE_PORT_TRX NRF_P0
#define CPUNET_UARTE_PIN_RTS 10
#define CPUNET_UARTE_PIN_CTS 12
#elif defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
#define CPUNET_UARTE_PIN_TX 1
#define CPUNET_UARTE_PIN_RX 0
#define CPUNET_UARTE_PORT_TRX NRF_P1
Expand Down
22 changes: 0 additions & 22 deletions boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig
View file
Open in desktop

This file was deleted.

Loading