bluetooth: Update to use SOC_SERIES_NRF Kconfigs without X suffix

Updates usage of the old Kconfig to use the new Kconfig

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
2026-01-15 09:03:51 +00:00
committed by Fabio Baltieri
parent a7e099f20b
commit 9700579f6a
8 changed files with 49 additions and 49 deletions

View File

@@ -353,54 +353,54 @@ config BT_CTLR_TX_PWR_PLUS_12
config BT_CTLR_TX_PWR_PLUS_10
bool "+10 dBm"
depends on SOC_SERIES_NRF54HX
depends on SOC_SERIES_NRF54H
config BT_CTLR_TX_PWR_PLUS_9
bool "+9 dBm"
depends on SOC_SERIES_NRF54HX || SOC_FAMILY_ESPRESSIF_ESP32
depends on SOC_SERIES_NRF54H || SOC_FAMILY_ESPRESSIF_ESP32
config BT_CTLR_TX_PWR_PLUS_8
bool "+8 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_PLUS_7
bool "+7 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_PLUS_6
bool "+6 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX || SOC_FAMILY_ESPRESSIF_ESP32
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX || SOC_FAMILY_ESPRESSIF_ESP32
config BT_CTLR_TX_PWR_PLUS_5
bool "+5 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_PLUS_4
bool "+4 dBm"
depends on SOC_SERIES_NRF51X || SOC_COMPATIBLE_NRF52X || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on SOC_SERIES_NRF51 || SOC_COMPATIBLE_NRF52X || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_PLUS_3
bool "+3 dBm"
depends on SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX || SOC_FAMILY_ESPRESSIF_ESP32
depends on SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX || SOC_FAMILY_ESPRESSIF_ESP32
config BT_CTLR_TX_PWR_PLUS_2
bool "+2 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_PLUS_1
bool "+1 dBm"
depends on SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_0
bool "0 dBm"
config BT_CTLR_TX_PWR_MINUS_1
bool "-1 dBm"
depends on SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_MINUS_2
bool "-2 dBm"
depends on SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_MINUS_3
bool "-3 dBm"
@@ -467,11 +467,11 @@ config BT_CTLR_TX_PWR_MINUS_26
config BT_CTLR_TX_PWR_MINUS_30
bool "-30 dBm"
depends on SOC_SERIES_NRF51X || SOC_SERIES_NRF54HX
depends on SOC_SERIES_NRF51 || SOC_SERIES_NRF54H
config BT_CTLR_TX_PWR_MINUS_40
bool "-40 dBm"
depends on SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54HX || SOC_COMPATIBLE_NRF54LX
depends on SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF54H || SOC_COMPATIBLE_NRF54LX
config BT_CTLR_TX_PWR_MINUS_46
bool "-46 dBm"
@@ -479,7 +479,7 @@ config BT_CTLR_TX_PWR_MINUS_46
config BT_CTLR_TX_PWR_MINUS_70
bool "-70 dBm"
depends on SOC_SERIES_NRF54HX
depends on SOC_SERIES_NRF54H
endchoice

View File

@@ -23,7 +23,7 @@ config BT_LLL_VENDOR_NORDIC
!BT_CTLR_DATA_LENGTH_CLEAR && \
!BT_CTLR_PHY_2M_NRF
select BT_CTLR_PRIVACY_SUPPORT if BT_CTLR_CRYPTO_SUPPORT && \
!SOC_SERIES_NRF51X
!SOC_SERIES_NRF51
select BT_CTLR_CONN_PARAM_REQ_SUPPORT
select BT_CTLR_EXT_REJ_IND_SUPPORT
select BT_CTLR_PER_INIT_FEAT_XCHG_SUPPORT
@@ -356,7 +356,7 @@ config BT_CTLR_TRPA_CACHE_SIZE
config BT_CTLR_DATA_LENGTH_CLEAR
bool "Data Length Support (Cleartext only)"
depends on SOC_SERIES_NRF51X
depends on SOC_SERIES_NRF51
help
Enable support for Bluetooth v4.2 LE Data Length Update procedure, up to
251 byte cleartext payloads in the Controller. Encrypted connections
@@ -365,7 +365,7 @@ config BT_CTLR_DATA_LENGTH_CLEAR
config BT_CTLR_PHY_2M_NRF
bool "2Mbps Nordic Semiconductor PHY Support (Cleartext only)"
depends on SOC_SERIES_NRF51X
depends on SOC_SERIES_NRF51
help
Enable support for Nordic Semiconductor proprietary 2Mbps PHY in the
Controller. Encrypted connections are not supported.
@@ -889,7 +889,7 @@ config BT_CTLR_SLOT_RESERVATION_UPDATE
config BT_CTLR_LLL_PRIO
int "Lower Link Layer (Radio) IRQ priority" if (BT_CTLR_ULL_LLL_PRIO_SUPPORT && !BT_CTLR_ZLI)
range 0 3 if SOC_SERIES_NRF51X
range 0 3 if SOC_SERIES_NRF51
range 0 6 if (SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X)
default 0
help
@@ -897,7 +897,7 @@ config BT_CTLR_LLL_PRIO
config BT_CTLR_ULL_HIGH_PRIO
int "Upper Link Layer High IRQ priority" if BT_CTLR_ULL_LLL_PRIO_SUPPORT
range BT_CTLR_LLL_PRIO 3 if SOC_SERIES_NRF51X
range BT_CTLR_LLL_PRIO 3 if SOC_SERIES_NRF51
range BT_CTLR_LLL_PRIO 6 if (SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X)
default BT_CTLR_LLL_PRIO if (!BT_CTLR_ULL_LLL_PRIO_SUPPORT || BT_CTLR_ZLI || BT_CTLR_LOW_LAT)
default 1
@@ -907,7 +907,7 @@ config BT_CTLR_ULL_HIGH_PRIO
config BT_CTLR_ULL_LOW_PRIO
int "Upper Link Layer Low IRQ priority" if BT_CTLR_ULL_LLL_PRIO_SUPPORT
range BT_CTLR_ULL_HIGH_PRIO 3 if SOC_SERIES_NRF51X
range BT_CTLR_ULL_HIGH_PRIO 3 if SOC_SERIES_NRF51
range BT_CTLR_ULL_HIGH_PRIO 6 if (SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X)
default BT_CTLR_ULL_HIGH_PRIO
help
@@ -917,7 +917,7 @@ config BT_CTLR_ULL_LOW_PRIO
config BT_CTLR_LOW_LAT
bool "Low latency non-negotiating event preemption"
depends on BT_CTLR_LOW_LAT_ULL && BT_CTLR_LOW_LAT_ULL_DONE
default y if SOC_SERIES_NRF51X
default y if SOC_SERIES_NRF51
help
Use low latency non-negotiating event preemption. This reduces
Radio ISR latencies by the controller event scheduling framework.
@@ -926,14 +926,14 @@ config BT_CTLR_LOW_LAT
config BT_CTLR_LOW_LAT_ULL
bool "Low latency ULL"
default y if SOC_SERIES_NRF51X
default y if SOC_SERIES_NRF51
help
Low latency ULL implementation that uses tailchaining instead of while
loop to demux rx messages from LLL.
config BT_CTLR_LOW_LAT_ULL_DONE
bool "Low latency ULL prepare dequeue"
default y if SOC_SERIES_NRF51X
default y if SOC_SERIES_NRF51
help
Done events be processed and dequeued in ULL context.
@@ -1240,7 +1240,7 @@ config BT_TICKER_CNTR_FREE_RUNNING
config BT_TICKER_LOW_LAT
bool "Ticker low latency mode"
default y if SOC_SERIES_NRF51X
default y if SOC_SERIES_NRF51
help
This option enables legacy ticker scheduling which defers overlapping
ticker node timeouts and thereby prevents ticker interrupts during

View File

@@ -12,7 +12,7 @@
* conditionally compile them based on feature Kconfig defines in those
* resources header file.
*/
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#if defined(CONFIG_SOC_SERIES_NRF51) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#include "../radio/radio_nrf5_ppi_resources.h"
#else
#include "../radio/radio_nrf5_dppi_resources.h"
@@ -78,7 +78,7 @@
#endif
#if defined(CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE)
#if !defined(CONFIG_SOC_SERIES_NRF51X) && !defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#if !defined(CONFIG_SOC_SERIES_NRF51) && !defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define HAL_USED_PPI_CHANNELS_7 \
(BIT(HAL_SW_SWITCH_TIMER_PHYEND_DELAY_COMPENSATION_DISABLE_PPI))
#else

View File

@@ -294,7 +294,7 @@ void radio_phy_set(uint8_t phy, uint8_t flags)
NRF_RADIO->MODE = (mode << RADIO_MODE_MODE_Pos) & RADIO_MODE_MODE_Msk;
#if !defined(CONFIG_SOC_SERIES_NRF51X) && !defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#if !defined(CONFIG_SOC_SERIES_NRF51) && !defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#if defined(CONFIG_BT_CTLR_RADIO_ENABLE_FAST)
NRF_RADIO->MODECNF0 = ((RADIO_MODECNF0_DTX_Center <<
RADIO_MODECNF0_DTX_Pos) &
@@ -307,7 +307,7 @@ void radio_phy_set(uint8_t phy, uint8_t flags)
RADIO_MODECNF0_DTX_Pos) &
RADIO_MODECNF0_DTX_Msk;
#endif /* !CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
#endif /* !CONFIG_SOC_SERIES_NRF51X && !CONFIG_SOC_COMPATIBLE_NRF54LX */
#endif /* !CONFIG_SOC_SERIES_NRF51 && !CONFIG_SOC_COMPATIBLE_NRF54LX */
}
void radio_tx_power_set(int8_t power)
@@ -385,7 +385,7 @@ void radio_pkt_configure(uint8_t bits_len, uint8_t max_len, uint8_t flags)
uint32_t extra;
uint8_t phy;
#if defined(CONFIG_SOC_SERIES_NRF51X)
#if defined(CONFIG_SOC_SERIES_NRF51)
ARG_UNUSED(phy);
extra = 0U;
@@ -1056,7 +1056,7 @@ void radio_rssi_measure(void)
{
NRF_RADIO->SHORTS |=
(RADIO_SHORTS_ADDRESS_RSSISTART_Msk |
#if defined(CONFIG_SOC_SERIES_NRF51X) || \
#if defined(CONFIG_SOC_SERIES_NRF51) || \
defined(CONFIG_SOC_COMPATIBLE_NRF52X) || \
defined(CONFIG_SOC_COMPATIBLE_NRF5340_CPUNET)
RADIO_SHORTS_DISABLED_RSSISTOP_Msk |
@@ -1071,7 +1071,7 @@ uint32_t radio_rssi_get(void)
void radio_rssi_status_reset(void)
{
#if defined(CONFIG_SOC_SERIES_NRF51X) || \
#if defined(CONFIG_SOC_SERIES_NRF51) || \
defined(CONFIG_SOC_COMPATIBLE_NRF52X) || \
defined(CONFIG_SOC_COMPATIBLE_NRF5340_CPUNET)
nrf_radio_event_clear(NRF_RADIO, NRF_RADIO_EVENT_RSSIEND);
@@ -1080,7 +1080,7 @@ void radio_rssi_status_reset(void)
uint32_t radio_rssi_is_ready(void)
{
#if defined(CONFIG_SOC_SERIES_NRF51X) || \
#if defined(CONFIG_SOC_SERIES_NRF51) || \
defined(CONFIG_SOC_COMPATIBLE_NRF52X) || \
defined(CONFIG_SOC_COMPATIBLE_NRF5340_CPUNET)
return (NRF_RADIO->EVENTS_RSSIEND != 0);
@@ -2109,7 +2109,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
mode |= (CCM_MODE_LENGTH_Extended << CCM_MODE_LENGTH_Pos) &
CCM_MODE_LENGTH_Msk;
#elif defined(CONFIG_SOC_SERIES_NRF51X)
#elif defined(CONFIG_SOC_SERIES_NRF51)
mode = (CCM_MODE_MODE_Decryption << CCM_MODE_MODE_Pos) &
CCM_MODE_MODE_Msk;
@@ -2121,10 +2121,10 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
switch (phy) {
default:
case PHY_1M:
#if !defined(CONFIG_SOC_SERIES_NRF51X) && !defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#if !defined(CONFIG_SOC_SERIES_NRF51) && !defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
mode |= (CCM_MODE_DATARATE_1Mbit << CCM_MODE_DATARATE_Pos) &
CCM_MODE_DATARATE_Msk;
#endif /* !CONFIG_SOC_SERIES_NRF51X && !CONFIG_SOC_COMPATIBLE_NRF54LX */
#endif /* !CONFIG_SOC_SERIES_NRF51 && !CONFIG_SOC_COMPATIBLE_NRF54LX */
if (false) {
@@ -2147,10 +2147,10 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
break;
case PHY_2M:
#if !defined(CONFIG_SOC_SERIES_NRF51X) && !defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#if !defined(CONFIG_SOC_SERIES_NRF51) && !defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
mode |= (CCM_MODE_DATARATE_2Mbit << CCM_MODE_DATARATE_Pos) &
CCM_MODE_DATARATE_Msk;
#endif /* !CONFIG_SOC_SERIES_NRF51X && !CONFIG_SOC_COMPATIBLE_NRF54LX */
#endif /* !CONFIG_SOC_SERIES_NRF51 && !CONFIG_SOC_COMPATIBLE_NRF54LX */
hal_trigger_crypt_ppi_config();
hal_radio_nrf_ppi_channels_enable(BIT(HAL_TRIGGER_CRYPT_PPI));
@@ -2208,7 +2208,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
* CONFIG_SOC_COMPATIBLE_NRF54LX
*/
#if !defined(CONFIG_SOC_SERIES_NRF51X) && \
#if !defined(CONFIG_SOC_SERIES_NRF51) && \
!defined(CONFIG_SOC_NRF52832) && \
!defined(CONFIG_SOC_COMPATIBLE_NRF54LX) && \
(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
@@ -2363,7 +2363,7 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
mode |= (CCM_MODE_DATARATE_2Mbit << CCM_MODE_DATARATE_Pos) &
CCM_MODE_DATARATE_Msk;
#elif defined(CONFIG_SOC_SERIES_NRF51X)
#elif defined(CONFIG_SOC_SERIES_NRF51)
mode = (CCM_MODE_MODE_Encryption << CCM_MODE_MODE_Pos) &
CCM_MODE_MODE_Msk;
@@ -2397,7 +2397,7 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
* CONFIG_SOC_COMPATIBLE_NRF54LX
*/
#if !defined(CONFIG_SOC_SERIES_NRF51X) && \
#if !defined(CONFIG_SOC_SERIES_NRF51) && \
!defined(CONFIG_SOC_NRF52832) && \
!defined(CONFIG_SOC_COMPATIBLE_NRF54LX) && \
(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \

View File

@@ -20,7 +20,7 @@
#define HAL_RADIO_NS2US_ROUND(ns) ((ns + 500)/1000)
/* SoC specific defines */
#if defined(CONFIG_SOC_SERIES_NRF51X)
#if defined(CONFIG_SOC_SERIES_NRF51)
#include "radio_nrf51.h"
#elif defined(CONFIG_SOC_NRF52805)
#include "radio_nrf52805.h"
@@ -39,7 +39,7 @@
#elif defined(CONFIG_SOC_NRF5340_CPUNET)
#include <hal/nrf_vreqctrl.h>
#include "radio_nrf5340.h"
#elif defined(CONFIG_SOC_SERIES_NRF54LX)
#elif defined(CONFIG_SOC_SERIES_NRF54L)
#include <hal/nrf_ppib.h>
#include "radio_nrf54lx.h"
#elif defined(CONFIG_BOARD_NRF52_BSIM)
@@ -81,7 +81,7 @@
/* Include RTC/GRTC Compare Index used to Trigger Radio TXEN/RXEN */
#include "hal/cntr.h"
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#if defined(CONFIG_SOC_SERIES_NRF51) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#include <hal/nrf_ppi.h>
#include "radio_nrf5_ppi_resources.h"
#include "radio_nrf5_ppi.h"
@@ -102,7 +102,7 @@
#define HAL_RADIO_RESET_VALUE_PCNF1 0x00000000UL
/* SoC specific Radio PDU length field maximum value */
#if defined(CONFIG_SOC_SERIES_NRF51X)
#if defined(CONFIG_SOC_SERIES_NRF51)
#define HAL_RADIO_PDU_LEN_MAX (BIT(5) - 1)
#else
#define HAL_RADIO_PDU_LEN_MAX (BIT(8) - 1)

View File

@@ -5,7 +5,7 @@
*/
/* nRF51 and nRF52 Series IRQ mapping*/
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#if defined(CONFIG_SOC_SERIES_NRF51) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define HAL_SWI_RADIO_IRQ SWI4_IRQn
#define HAL_SWI_WORKER_IRQ RTC0_IRQn

View File

@@ -6,7 +6,7 @@
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#define BT_HCI_VS_HW_PLAT BT_HCI_VS_HW_PLAT_NORDIC
#if defined(CONFIG_SOC_SERIES_NRF51X)
#if defined(CONFIG_SOC_SERIES_NRF51)
#define BT_HCI_VS_HW_VAR BT_HCI_VS_HW_VAR_NORDIC_NRF51X
#elif defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define BT_HCI_VS_HW_VAR BT_HCI_VS_HW_VAR_NORDIC_NRF52X

View File

@@ -75,7 +75,7 @@ config BT_HCI_TX_PRIO
choice BT_RECV_CONTEXT
prompt "BT RX Thread Selection"
default BT_RECV_WORKQ_SYS if SOC_SERIES_NRF51X
default BT_RECV_WORKQ_SYS if SOC_SERIES_NRF51
default BT_RECV_WORKQ_BT
help
Selects in which context incoming low priority HCI packets are processed.
@@ -139,7 +139,7 @@ config BT_TX_PROCESSOR_THREAD
bool "TX processor thread. Disabling may cause deadlocks."
# This option is automatically selected for all platforms except nRF51
# due to limited RAM on nRF51 devices.
default y if !SOC_SERIES_NRF51X
default y if !SOC_SERIES_NRF51
if BT_TX_PROCESSOR_THREAD