Skip to content

Commit

Permalink
Merge pull request #21250 from mguetschow/nrf-radio-conflict
Browse files Browse the repository at this point in the history
cpu/nrf5*: mark and resolve radio conflict
  • Loading branch information
dylad authored Feb 28, 2025
2 parents cdcabf2 + 7ef1f7e commit 526fc3c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions cpu/nrf52/Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ ifneq (,$(filter nrf802154,$(USEMODULE)))
endif
endif

ifneq (,$(filter nrfble,$(USEMODULE)))
FEATURES_REQUIRED += radio_nrfble
endif

# The nrf52832 requires gpio IRQ with SPI to work around errata 58
ifneq (,$(filter nrf52832xxaa,$(CPU_MODEL)))
ifneq (,$(filter periph_spi,$(USEMODULE)))
Expand Down
2 changes: 1 addition & 1 deletion cpu/nrf52/Makefile.nrf802154.dep
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ifneq (,$(filter netdev_default,$(USEMODULE)))
ifeq (,$(filter nimble_% nrfmin,$(USEMODULE)))
ifeq (,$(filter nimble_% nrfmin nrfble,$(USEMODULE)))
USEMODULE += nrf802154
endif
endif
3 changes: 3 additions & 0 deletions cpu/nrf5x_common/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ ifeq (,$(filter nrf9160 nrf5340_app,$(CPU_MODEL)))
FEATURES_PROVIDED += netif
endif

FEATURES_CONFLICT += radio_nrf802154:radio_nrfble radio_nrf802154:radio_nrfmin radio_nrfble:radio_nrfmin
FEATURES_CONFLICT_MSG += "Multiplexing the nRF radio between different radio modes is not supported."

include $(RIOTCPU)/cortexm_common/Makefile.features

0 comments on commit 526fc3c

Please sign in to comment.