Skip to content

Commit d92e4fb

Browse files
ioannisgnashif
ioannisg
authored and
nashif
committed
boards: nrf: remove support for deprecated board nRF5340 PDK
nRF5340 PDK board was deprecated in v2.5.0 release and is removed now from the tree. Signed-off-by: Ioannis Glaropoulos <[email protected]>
1 parent d2c5664 commit d92e4fb

18 files changed

+22
-406
lines changed

‎boards/arm/nrf5340dk_nrf5340/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Copyright (c) 2019 Nordic Semiconductor ASA.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if (((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)
5-
OR (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS))
4+
if ((CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
65
AND CONFIG_BOARD_ENABLE_CPUNET)
76
zephyr_library()
87
zephyr_library_sources(nrf5340_cpunet_reset.c)
@@ -30,9 +29,7 @@ if (CONFIG_BUILD_WITH_TFM)
3029
set(TFM_PUBLIC_KEY_FORMAT "full")
3130
endif()
3231

33-
if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)
34-
set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340PDK_NRF5340_CPUAPP)
35-
elseif(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
32+
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
3633
set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340DK_NRF5340_CPUAPP)
3734
endif()
3835

‎boards/arm/nrf5340dk_nrf5340/Kconfig‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nRF5340 (P)DK board configuration
1+
# nRF5340 DK board configuration
22

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

4040
endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT
4141

42-
if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
42+
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
4343

4444
config BOARD_ENABLE_DCDC_APP
4545
bool "Enable Application MCU DCDC converter"
@@ -82,7 +82,6 @@ config BOARD_ENABLE_CPUNET
8282

8383
config DOMAIN_CPUNET_BOARD
8484
string
85-
default "nrf5340pdk_nrf5340_cpunet" if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS
8685
default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
8786
depends on BOARD_ENABLE_CPUNET
8887
help
@@ -91,9 +90,9 @@ config DOMAIN_CPUNET_BOARD
9190
another board. For example hci_rpmsg on the nRF5340_cpunet for
9291
Bluetooth applications.
9392

94-
endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
93+
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
9594

96-
if BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET
95+
if BOARD_NRF5340DK_NRF5340_CPUNET
9796

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

106105
config DOMAIN_CPUAPP_BOARD
107106
string
108-
default "nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUNET
109107
default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUNET
110108
help
111109
The board which will be used for CPUAPP domain when creating a multi
112110
image application where one or more images should be located on
113111
another board.
114112

115-
endif # BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET
113+
endif # BOARD_NRF5340DK_NRF5340_CPUNET

‎boards/arm/nrf5340dk_nrf5340/Kconfig.board‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
# nRF5340 (P)DK NRF5340 board configuration
1+
# nRF5340 DK NRF5340 board configuration
22

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

66
if SOC_NRF5340_CPUAPP_QKAA
77

8-
config BOARD_NRF5340PDK_NRF5340_CPUAPP
9-
bool "nRF5340 PDK nRF5340 Application MCU"
10-
11-
config BOARD_NRF5340PDK_NRF5340_CPUAPPNS
12-
bool "nRF5340 PDK nRF5340 Application MCU non-secure"
13-
148
config BOARD_NRF5340DK_NRF5340_CPUAPP
159
bool "nRF5340 DK nRF5340 Application MCU"
1610

@@ -19,10 +13,6 @@ config BOARD_NRF5340DK_NRF5340_CPUAPPNS
1913

2014
endif # SOC_NRF5340_CPUAPP_QKAA
2115

22-
config BOARD_NRF5340PDK_NRF5340_CPUNET
23-
bool "nRF5340 PDK NRF5340 Network MCU"
24-
depends on SOC_NRF5340_CPUNET_QKAA
25-
2616
config BOARD_NRF5340DK_NRF5340_CPUNET
2717
bool "nRF5340 DK NRF5340 Network MCU"
2818
depends on SOC_NRF5340_CPUNET_QKAA

‎boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
# nRF5340 (P)DK nRF5340 board configuration
1+
# nRF5340 DK nRF5340 board configuration
22

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

6-
if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUNET
7-
8-
config BOARD_DEPRECATED_RELEASE
9-
default "v2.6.0"
10-
11-
endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUNET
12-
13-
if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
6+
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
147

158
config BOARD
16-
default "nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS
179
default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
1810

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

2214
config BUILD_WITH_TFM
23-
default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUAPPNS
15+
default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS
2416

2517
# Code Partition:
2618
#
@@ -50,25 +42,25 @@ config BUILD_WITH_TFM
5042
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
5143
DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
5244

53-
if (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE
45+
if BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
5446

5547
config FLASH_LOAD_SIZE
5648
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
5749

5850
config SRAM_SIZE
5951
default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
6052

61-
endif # (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE
53+
endif # BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
6254

63-
if BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS
55+
if BOARD_NRF5340DK_NRF5340_CPUAPPNS
6456

6557
config FLASH_LOAD_OFFSET
6658
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
6759

6860
config FLASH_LOAD_SIZE
6961
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
7062

71-
endif # BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS
63+
endif # BOARD_NRF5340DK_NRF5340_CPUAPPNS
7264

7365
if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB
7466

@@ -80,8 +72,7 @@ config USB_DEVICE_STACK
8072

8173
endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB
8274

83-
endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
75+
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
8476

8577
config BOARD
86-
default "nrf5340pdk_nrf5340_cpunet" if BOARD_NRF5340PDK_NRF5340_CPUNET
8778
default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET

‎boards/arm/nrf5340dk_nrf5340/board.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
3+
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
44
set(TFM_PUBLIC_KEY_FORMAT "full")
55
endif()
66

7-
if((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) OR
8-
(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS))
7+
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
98
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
109
endif()
1110

12-
if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
11+
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
1312
board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
1413
endif()
1514

‎boards/arm/nrf5340dk_nrf5340/doc/index.rst‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ More information about the board can be found at the
5252
The `Nordic Semiconductor Infocenter`_
5353
contains the processor's information and the datasheet.
5454

55-
.. note::
56-
57-
nRF5340 PDK (preview development kit) is an earlier version of the
58-
nRF5340 DK. nRF5340 PDK board is deprecated and is replaced by nRF5340 DK.
59-
The support for nRF5340 PDK will be removed in Zephyr v2.6.0 release.
60-
6155

6256
Hardware
6357
********

‎boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_partition_conf.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
/*
8-
* Default Flash planning for nrf5340pdk_nrf5340 CPUAPP (Application MCU).
8+
* Default Flash planning for nrf5340dk_nrf5340 CPUAPP (Application MCU).
99
*
1010
* Zephyr build for nRF5340 with ARM TrustZone-M support,
1111
* implies building Secure and Non-Secure Zephyr images.

‎boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,12 @@
1010

1111
#include <soc.h>
1212

13-
LOG_MODULE_REGISTER(nrf5340pdk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
13+
LOG_MODULE_REGISTER(nrf5340dk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
1414

1515
#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
1616

1717
/* This should come from DTS, possibly an overlay. */
18-
#if defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP)
19-
#define CPUNET_UARTE_PIN_TX 25
20-
#define CPUNET_UARTE_PIN_RX 26
21-
#define CPUNET_UARTE_PORT_TRX NRF_P0
22-
#define CPUNET_UARTE_PIN_RTS 10
23-
#define CPUNET_UARTE_PIN_CTS 12
24-
#elif defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
18+
#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
2519
#define CPUNET_UARTE_PIN_TX 1
2620
#define CPUNET_UARTE_PIN_RX 0
2721
#define CPUNET_UARTE_PORT_TRX NRF_P1

‎boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)