Skip to content

Commit 55d9f2e

Browse files
committed
bluetooth: controller: remove support for nRF5340 PDK
Remove support for nRF5340 PDK in the BLE controller. The controller will now support only the nRF5340 DK. Signed-off-by: Ioannis Glaropoulos <[email protected]>
1 parent 3185ca8 commit 55d9f2e

File tree

4 files changed

+7
-25
lines changed

4 files changed

+7
-25
lines changed

subsys/bluetooth/controller/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ endif # BT_CTLR
606606

607607
config BT_CTLR_DEBUG_PINS_CPUAPP
608608
bool "Bluetooth Controller Debug Pins"
609-
depends on BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP
609+
depends on BOARD_NRF5340DK_NRF5340_CPUAPP
610610
help
611611
Route debug GPIO toggling for the BLE Controller. Enable this when
612612
using Bluetooth Controller Debug Pins in co-processor and the main

subsys/bluetooth/controller/Kconfig.ll_sw_split

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ config BT_CTLR_PROFILE_ISR
658658

659659
config BT_CTLR_DEBUG_PINS
660660
bool "Bluetooth Controller Debug Pins"
661-
depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52DK_NRF52810 || BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET || BOARD_RV32M1_VEGA
661+
depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52DK_NRF52810 || BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUNET || BOARD_RV32M1_VEGA
662662
help
663663
Turn on debug GPIO toggling for the BLE Controller. This is useful
664664
when debugging with a logic analyzer or profiling certain sections of

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
#if defined(CONFIG_BT_CTLR_DEBUG_PINS) || \
99
defined(CONFIG_BT_CTLR_DEBUG_PINS_CPUAPP)
10-
#if defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP) || \
11-
defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET) || \
12-
defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) || \
10+
#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) || \
1311
defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
1412
#define DEBUG_PORT NRF_P1
1513
#define DEBUG_PIN_IDX0 0
@@ -32,8 +30,7 @@
3230
#define DEBUG_PIN7 BIT(DEBUG_PIN_IDX7)
3331
#define DEBUG_PIN8 BIT(DEBUG_PIN_IDX8)
3432
#define DEBUG_PIN9 BIT(DEBUG_PIN_IDX9)
35-
#if defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP) || \
36-
defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
33+
#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
3734
#define DEBUG_SETUP() \
3835
do { \
3936
DEBUG_PORT->PIN_CNF[DEBUG_PIN_IDX0] = \
@@ -67,7 +64,7 @@
6764
(GPIO_PIN_CNF_MCUSEL_NetworkMCU << \
6865
GPIO_PIN_CNF_MCUSEL_Pos); \
6966
} while (0)
70-
#endif /* CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP */
67+
#endif /* CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP */
7168
#elif defined(CONFIG_BOARD_NRF52840DK_NRF52840)
7269
#define DEBUG_PORT NRF_P1
7370
#define DEBUG_PIN0 BIT(1)

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
#elif defined(CONFIG_SOC_SERIES_NRF53X)
2222

2323
/* nRF53 Series Engineering D and Revision 1 IRQ mapping */
24-
#if defined(CONFIG_SOC_NRF5340_CPUNET) && \
25-
!defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET)
24+
#if defined(CONFIG_SOC_NRF5340_CPUNET)
2625

2726
#define HAL_SWI_RADIO_IRQ SWI2_IRQn
2827
#define HAL_SWI_WORKER_IRQ RTC0_IRQn
@@ -34,21 +33,7 @@
3433
#define HAL_SWI_JOB_IRQ SWI3_IRQn
3534
#endif
3635

37-
/* nRF53 Series Engineering A IRQ mapping */
38-
#elif defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET)
39-
40-
/* NOTE: nRF5340 Engineering A Errata [29] SWI: SWIRQ is not functional */
41-
#define HAL_SWI_RADIO_IRQ EGU0_IRQn
42-
#define HAL_SWI_WORKER_IRQ RTC0_IRQn
43-
44-
#if !defined(CONFIG_BT_CTLR_LOW_LAT) && \
45-
(CONFIG_BT_CTLR_ULL_HIGH_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
46-
#define HAL_SWI_JOB_IRQ HAL_SWI_WORKER_IRQ
47-
#else
48-
#error "Use an unused IRQ line to implement a second SW IRQ."
49-
#endif
50-
51-
#endif /* CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET */
36+
#endif /* CONFIG_SOC_NRF5340_CPUNET */
5237

5338
#endif /* CONFIG_SOC_SERIES_NRF53X */
5439

0 commit comments

Comments
 (0)