Skip to content

Commit cc130b3

Browse files
committed
modules: hal_silabs: Set multiprotocol define based on Kconfig
Set `SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT` to `1` when Rail Multiprotocol Kconfig is enabled. This is required to run the Bluetooth multiprotocol initialization code during `sl_btctrl_init`. Signed-off-by: James Smith <[email protected]>
1 parent c58f8fb commit cc130b3

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

modules/hal_silabs/gecko/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,11 @@ if(${CONFIG_SOC_GECKO_HAS_RADIO})
5050

5151
# prebuilt libs
5252
if(CONFIG_SILABS_GECKO_RAIL_MULTIPROTOCOL)
53+
zephyr_compile_definitions(SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT=1)
5354
add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg${GECKO_SERIES_NUMBER}_gcc_release.a)
55+
5456
else()
57+
zephyr_compile_definitions(SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT=0)
5558
add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_efr32xg${GECKO_SERIES_NUMBER}_gcc_release.a)
5659
endif()
5760

modules/hal_silabs/simplicity_sdk/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ if(CONFIG_SOC_GECKO_HAS_RADIO)
101101
endif()
102102
zephyr_library_sources(${RADIO_DIR}/rail_lib/plugin/pa-conversions/pa_conversions_efr32.c)
103103

104+
if(CONFIG_SILABS_SISDK_RAIL_MULTIPROTOCOL)
105+
zephyr_compile_definitions(SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT=1)
106+
else()
107+
zephyr_compile_definitions(SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT=0)
108+
endif()
109+
104110
if(CONFIG_SILABS_DEVICE_IS_MODULE)
105111
# RAIL lib and config for modules
106112
if(CONFIG_SILABS_SISDK_RAIL_MULTIPROTOCOL)

modules/hal_silabs/simplicity_sdk/config/ll/sl_btctrl_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
#undef SL_CATALOG_BLUETOOTH_FEATURE_USER_POWER_CONTROL_PRESENT
139139
#undef SL_CATALOG_KERNEL_PRESENT /* Only relevant in the SiSDK RTOS adaptation */
140140
#undef SL_CATALOG_RAIL_UTIL_COEX_PRESENT
141-
#undef SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT
142141

143142
/* Maps the controller configuration options from Kconfig to Silabs defines */
144143
#define SL_BT_CONTROLLER_BUFFER_MEMORY CONFIG_BT_SILABS_EFR32_BUFFER_MEMORY

0 commit comments

Comments
 (0)