michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: ll_sw: Fix wrong cmake code that adds radio_df.c

Browse source 
Fix error introduced by pull request:
https://github.com/zephyrproject-rtos/zephyr/pull/31591

Zephyrs CMake extension function zephyr_library_sources_ifdef()
does not allow to use complex conditions to toggle if
sources should be included in build or not.
It allows to use only single variable as an input for
feature_toggle argument because it is double-expanded
in contition statement in the function.

In case there is a requirement that source file is included
when more complicated condition is true we have to fall-back
to reqular if() statement and zephyr_library_sources().

The fix is required because without it radio_df.c source
is never compiled. If DF functionality is enabled build
will fail because of missing functions implementation.

Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
This commit is contained in:
Piotr Pryga 2021-01-26 22:29:26 -08:00 • committed by Anas Nashif
commit 53b4da93e9
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/bluetooth/controller/ll_sw/nrf.cmake
View file

@ -56,10 +56,9 @@ if(CONFIG_BT_LL_SW_SPLIT)
CONFIG_BT_CTLR_DF
ll_sw/nordic/lll/lll_df.c
)
zephyr_library_sources_ifdef(
(CONFIG_BT_CTLR_DF AND NOT CONFIG_SOC_SERIES_BSIM_NRFXX)
if(CONFIG_BT_CTLR_DF AND NOT CONFIG_SOC_SERIES_BSIM_NRFXX)
zephyr_library_sources(ll_sw/nordic/hal/nrf5/radio/radio_df.c)
)
endif()
zephyr_library_include_directories(
ll_sw/nordic/lll
)