Skip to content

Commit 369ffb4

Browse files
nordic-krchcarlescufi
authored andcommitted
hal_nordic: Add protection against resource conflict (take 2)
Commit will be squeezed once agreement is reached. Signed-off-by: Krzysztof Chruscinski <[email protected]>
1 parent 5af49c1 commit 369ffb4

File tree

4 files changed

+3
-19
lines changed

4 files changed

+3
-19
lines changed

modules/hal_nordic/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ menuconfig NRF_802154_RADIO_DRIVER
2323
depends on HAS_HW_NRF_RADIO_IEEE802154
2424
select DYNAMIC_INTERRUPTS
2525
select ENTROPY_GENERATOR
26+
depends on !$(dt_nodelabel_enabled,timer1)
2627
help
2728
This option enables nRF IEEE 802.15.4 radio driver in Zephyr. Note,
2829
that beside the radio peripheral itself, this drivers occupies several

modules/hal_nordic/nrf_802154/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ zephyr_library_named(nrf-802154-platform)
55
zephyr_interface_library_named(zephyr-802154-interface)
66

77
if (CONFIG_NRF_802154_RADIO_DRIVER)
8-
dt_nodelabel(timer1_node NODELABEL "timer1")
9-
dt_node_has_status(status_result PATH ${timer1_node} STATUS okay)
10-
if (${status_result})
11-
message(FATAL_ERROR "Resource conflict. IEEE802.15.4 Radio driver requires TIMER1 but "
12-
"timer1 node is enabled (for counter driver).")
13-
endif()
14-
158
target_sources(nrf-802154-platform
169
PRIVATE
1710
${CMAKE_CURRENT_SOURCE_DIR}/radio/platform/nrf_802154_random_zephyr.c

subsys/bluetooth/controller/Kconfig.ll_sw_split

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ config BT_LLL_VENDOR_NORDIC
5555
select BT_TICKER_LAZY_GET if BT_CTLR_ADV_PERIODIC
5656

5757
default y
58+
depends on !$(dt_nodelabel_enabled,timer0)
59+
depends on !$(dt_nodelabel_enabled,rtc0)
5860
help
5961
Use Nordic Lower Link Layer implementation.
6062

subsys/bluetooth/controller/ll_sw/nrf.cmake

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
if(CONFIG_BT_LL_SW_SPLIT)
4-
dt_nodelabel(rtc0_node NODELABEL "rtc0")
5-
dt_node_has_status(status_result PATH ${rtc0_node} STATUS okay)
6-
if (${status_result})
7-
message(FATAL_ERROR "Resource conflict. Bluetooth Link Layer requires RTC0 but "
8-
"rtc0 node is enabled (for counter driver).")
9-
endif()
10-
dt_nodelabel(timer0_node NODELABEL "timer0")
11-
dt_node_has_status(status_result PATH ${timer0_node} STATUS okay)
12-
if (${status_result})
13-
message(FATAL_ERROR "Resource conflict. Bluetooth Link Layer requires TIMER0 but "
14-
"timer0 node is enabled (for counter driver).")
15-
endif()
164
zephyr_library_sources(
175
ll_sw/nordic/lll/lll.c
186
ll_sw/nordic/lll/lll_clock.c

0 commit comments

Comments
 (0)