Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/nrf5*: mark and resolve radio conflict #21250

Merged
merged 2 commits into from
Feb 28, 2025
Merged

cpu/nrf5*: mark and resolve radio conflict #21250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dc3c1b
cpu/nrf5x_common: prohibit selecting multiple radio mode features
mguetschow Feb 27, 2025
7ef1f7e
cpu/nrf52: do not select nrf52840 if nrfble is selected already
mguetschow Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cpu/nrf52/Makefile.dep
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading