Skip to content

Commit 526fc3c

Browse files
authored
Merge pull request #21250 from mguetschow/nrf-radio-conflict
cpu/nrf5*: mark and resolve radio conflict
2 parents cdcabf2 + 7ef1f7e commit 526fc3c

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

cpu/nrf52/Makefile.dep

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ ifneq (,$(filter nrf802154,$(USEMODULE)))
1717
endif
1818
endif
1919

20+
ifneq (,$(filter nrfble,$(USEMODULE)))
21+
FEATURES_REQUIRED += radio_nrfble
22+
endif
23+
2024
# The nrf52832 requires gpio IRQ with SPI to work around errata 58
2125
ifneq (,$(filter nrf52832xxaa,$(CPU_MODEL)))
2226
ifneq (,$(filter periph_spi,$(USEMODULE)))

cpu/nrf52/Makefile.nrf802154.dep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ifneq (,$(filter netdev_default,$(USEMODULE)))
2-
ifeq (,$(filter nimble_% nrfmin,$(USEMODULE)))
2+
ifeq (,$(filter nimble_% nrfmin nrfble,$(USEMODULE)))
33
USEMODULE += nrf802154
44
endif
55
endif

cpu/nrf5x_common/Makefile.features

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@ ifeq (,$(filter nrf9160 nrf5340_app,$(CPU_MODEL)))
3737
FEATURES_PROVIDED += netif
3838
endif
3939

40+
FEATURES_CONFLICT += radio_nrf802154:radio_nrfble radio_nrf802154:radio_nrfmin radio_nrfble:radio_nrfmin
41+
FEATURES_CONFLICT_MSG += "Multiplexing the nRF radio between different radio modes is not supported."
42+
4043
include $(RIOTCPU)/cortexm_common/Makefile.features

0 commit comments

Comments
 (0)