michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: controller: refactor CMake related files

Browse source 
Zephyr aims to enable supporting of multiple SW defined
BLE LL. There is a complex hierarchy of defines in the
CMake files controlling the compilation units that part of
the final library. Adding another SW LL implementation
from a different SoC provider will make the main controller
CMake file unmaintable.
As such, split the into vendor-specific CMake files for
easier additions.

Signed-off-by: Alex Porosanu <alexandru.porosanu@nxp.com>
This commit is contained in:
Alex Porosanu 2020-01-06 15:19:24 +02:00 • committed by Alberto Escolar
commit 3412612085
3 changed files with 166 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

149
subsys/bluetooth/controller/CMakeLists.txt
View file

@ -18,54 +18,11 @@ zephyr_library_sources_ifdef(
crypto/crypto.c
)
if(CONFIG_BT_LL_SW_LEGACY)
zephyr_library_sources(
ll_sw/ctrl.c
ll_sw/ll.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_BROADCASTER
ll_sw/ll_adv.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_OBSERVER
ll_sw/ll_scan.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_FILTER
ll_sw/ll_filter.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CENTRAL
ll_sw/ll_master.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_ADV_EXT
ll_sw/ll_adv_aux.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_HCI_MESH_EXT
ll_sw/ll_mesh.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_DTM
ll_sw/ll_test.c
)
endif()
if(CONFIG_BT_LL_SW_SPLIT)
zephyr_library_sources(
ll_sw/ull.c
ll_sw/lll_chan.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_OPENISA
ll_sw/openisa/lll/lll.c
)
if(CONFIG_BT_BROADCASTER)
zephyr_library_sources(
ll_sw/ull_adv.c
@ -74,66 +31,24 @@ if(CONFIG_BT_LL_SW_SPLIT)
CONFIG_BT_CTLR_ADV_EXT
ll_sw/ull_adv_aux.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_adv.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_OPENISA
ll_sw/openisa/lll/lll_adv.c
)
endif()
if(CONFIG_BT_OBSERVER)
zephyr_library_sources(
ll_sw/ull_scan.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_scan.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_OPENISA
ll_sw/openisa/lll/lll_scan.c
)
endif()
if(CONFIG_BT_CONN)
zephyr_library_sources(
ll_sw/ull_conn.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_clock.c
ll_sw/nordic/lll/lll_conn.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_OPENISA
ll_sw/openisa/lll/lll_clock.c
ll_sw/openisa/lll/lll_conn.c
)
if(CONFIG_BT_PERIPHERAL)
zephyr_library_sources(
ll_sw/ull_slave.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_slave.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_OPENISA
ll_sw/openisa/lll/lll_slave.c
)
endif()
if(CONFIG_BT_CENTRAL)
zephyr_library_sources(
ll_sw/ull_master.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_master.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_OPENISA
ll_sw/openisa/lll/lll_master.c
)
endif()
if(CONFIG_BT_CTLR_SCHED_ADVANCED)
@ -150,32 +65,12 @@ if(CONFIG_BT_LL_SW_SPLIT)
CONFIG_BT_HCI_MESH_EXT
ll_sw/ll_mesh.c
)
if(CONFIG_BT_LLL_VENDOR_NORDIC)
zephyr_library_include_directories(
ll_sw/nordic/lll
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_DTM
ll_sw/nordic/lll/lll_test.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_PROFILE_ISR
ll_sw/nordic/lll/lll_prof.c
)
endif()
if(CONFIG_BT_LLL_VENDOR_OPENISA)
zephyr_library_include_directories(
ll_sw/openisa/lll
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_DTM
ll_sw/openisa/lll/lll_test.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_PROFILE_ISR
ll_sw/openisa/lll/lll_test.c
)
endif()
endif()
if(CONFIG_SOC_COMPATIBLE_NRF)
include(ll_sw/nrf.cmake)
elseif(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
include(ll_sw/openisa.cmake)
endif()
zephyr_library_sources_ifdef(
@ -183,44 +78,12 @@ zephyr_library_sources_ifdef(
ll_sw/ll_settings.c
)
zephyr_library_sources_ifdef(
CONFIG_SOC_COMPATIBLE_NRF
ll_sw/nordic/hal/nrf5/cntr.c
ll_sw/nordic/hal/nrf5/ecb.c
ll_sw/nordic/hal/nrf5/radio/radio.c
ll_sw/nordic/hal/nrf5/mayfly.c
ll_sw/nordic/hal/nrf5/ticker.c
)
zephyr_library_sources_ifdef(
CONFIG_SOC_OPENISA_RV32M1_RISCV32
ll_sw/openisa/hal/RV32M1/cntr.c
ll_sw/openisa/hal/RV32M1/ecb.c
ll_sw/openisa/hal/RV32M1/radio/radio.c
ll_sw/openisa/hal/RV32M1/mayfly.c
ll_sw/openisa/hal/RV32M1/ticker.c
)
zephyr_library_include_directories(
.
include
ll_sw
)
if(CONFIG_SOC_COMPATIBLE_NRF)
zephyr_library_include_directories(
ll_sw/nordic
hci/nordic
)
endif()
if(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
zephyr_library_include_directories(
ll_sw/openisa
hci/openisa
)
endif()
zephyr_library_compile_options_ifdef(
CONFIG_BT_CTLR_FAST_ENC
${OPTIMIZE_FOR_SPEED_FLAG}

100
subsys/bluetooth/controller/ll_sw/nrf.cmake Normal file
View file

@ -0,0 +1,100 @@
# SPDX-License-Identifier: Apache-2.0
if(CONFIG_BT_LL_SW_LEGACY)
zephyr_library_sources(
ll_sw/ctrl.c
ll_sw/ll.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_BROADCASTER
ll_sw/ll_adv.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_OBSERVER
ll_sw/ll_scan.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_FILTER
ll_sw/ll_filter.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CENTRAL
ll_sw/ll_master.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_ADV_EXT
ll_sw/ll_adv_aux.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_HCI_MESH_EXT
ll_sw/ll_mesh.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_DTM
ll_sw/ll_test.c
)
endif()
if(CONFIG_BT_LL_SW_SPLIT)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll.c
)
if(CONFIG_BT_BROADCASTER)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_adv.c
)
endif()
if(CONFIG_BT_OBSERVER)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_scan.c
)
endif()
if(CONFIG_BT_CONN)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_clock.c
ll_sw/nordic/lll/lll_conn.c
)
if(CONFIG_BT_PERIPHERAL)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_slave.c
)
endif()
if(CONFIG_BT_CENTRAL)
zephyr_library_sources_ifdef(
CONFIG_BT_LLL_VENDOR_NORDIC
ll_sw/nordic/lll/lll_master.c
)
endif()
endif()
if(CONFIG_BT_LLL_VENDOR_NORDIC)
zephyr_library_include_directories(
ll_sw/nordic/lll
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_DTM
ll_sw/nordic/lll/lll_test.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_PROFILE_ISR
ll_sw/nordic/lll/lll_prof.c
)
endif()
endif()
zephyr_library_sources(
ll_sw/nordic/hal/nrf5/cntr.c
ll_sw/nordic/hal/nrf5/ecb.c
ll_sw/nordic/hal/nrf5/radio/radio.c
ll_sw/nordic/hal/nrf5/mayfly.c
ll_sw/nordic/hal/nrf5/ticker.c
)
zephyr_library_include_directories(
ll_sw/nordic
hci/nordic
)

60
subsys/bluetooth/controller/ll_sw/openisa.cmake Normal file
View file

@ -0,0 +1,60 @@
# SPDX-License-Identifier: Apache-2.0
if(CONFIG_BT_LL_SW_SPLIT)
zephyr_library_sources(
ll_sw/openisa/lll/lll.c
)
if(CONFIG_BT_BROADCASTER)
zephyr_library_sources(
ll_sw/openisa/lll/lll_adv.c
)
endif()
if(CONFIG_BT_OBSERVER)
zephyr_library_sources(
ll_sw/openisa/lll/lll_scan.c
)
endif()
if(CONFIG_BT_CONN)
zephyr_library_sources(
ll_sw/openisa/lll/lll_clock.c
ll_sw/openisa/lll/lll_conn.c
)
if(CONFIG_BT_PERIPHERAL)
zephyr_library_sources(
ll_sw/openisa/lll/lll_slave.c
)
endif()
if(CONFIG_BT_CENTRAL)
zephyr_library_sources(
ll_sw/openisa/lll/lll_master.c
)
endif()
endif()
zephyr_library_include_directories(
ll_sw/openisa/lll
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_DTM
ll_sw/openisa/lll/lll_test.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_PROFILE_ISR
ll_sw/openisa/lll/lll_test.c
)
endif()
zephyr_library_sources_ifdef(
CONFIG_SOC_OPENISA_RV32M1_RISCV32
ll_sw/openisa/hal/RV32M1/cntr.c
ll_sw/openisa/hal/RV32M1/ecb.c
ll_sw/openisa/hal/RV32M1/radio/radio.c
ll_sw/openisa/hal/RV32M1/mayfly.c
ll_sw/openisa/hal/RV32M1/ticker.c
)
if(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
zephyr_library_include_directories(
ll_sw/openisa
hci/openisa
)
endif()