diff --git a/cpu/nrf52/Makefile.dep b/cpu/nrf52/Makefile.dep index 9503c70377c2..52a3444b4fdc 100644 --- a/cpu/nrf52/Makefile.dep +++ b/cpu/nrf52/Makefile.dep @@ -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))) diff --git a/cpu/nrf52/Makefile.nrf802154.dep b/cpu/nrf52/Makefile.nrf802154.dep index e04fe5b154b3..a9a99e445691 100644 --- a/cpu/nrf52/Makefile.nrf802154.dep +++ b/cpu/nrf52/Makefile.nrf802154.dep @@ -1,5 +1,5 @@ ifneq (,$(filter netdev_default,$(USEMODULE))) - ifeq (,$(filter nimble_% nrfmin,$(USEMODULE))) + ifeq (,$(filter nimble_% nrfmin nrfble,$(USEMODULE))) USEMODULE += nrf802154 endif endif diff --git a/cpu/nrf5x_common/Makefile.features b/cpu/nrf5x_common/Makefile.features index 99043d56c4af..b8e4a24d5415 100644 --- a/cpu/nrf5x_common/Makefile.features +++ b/cpu/nrf5x_common/Makefile.features @@ -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