From bfb7cbfa4d47ecadf8942bbd3d34d5ab69d6fe23 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Thu, 5 Nov 2020 20:58:29 +0100 Subject: [PATCH] boards/nrf52: resolve netdev dependencies for all family members --- boards/common/nrf52/Makefile.dep | 12 ++++++------ .../{nrf52832/Makefile.dep => Makefile.nimble.dep} | 2 +- .../Makefile.dep => Makefile.nrf802154.dep} | 0 boards/common/nrf52/Makefile.nrfmin.dep | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) rename boards/common/nrf52/{nrf52832/Makefile.dep => Makefile.nimble.dep} (65%) rename boards/common/nrf52/{nrf52840/Makefile.dep => Makefile.nrf802154.dep} (100%) create mode 100644 boards/common/nrf52/Makefile.nrfmin.dep diff --git a/boards/common/nrf52/Makefile.dep b/boards/common/nrf52/Makefile.dep index 7983ffd731..327585d2b8 100644 --- a/boards/common/nrf52/Makefile.dep +++ b/boards/common/nrf52/Makefile.dep @@ -2,10 +2,10 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_nrf_temperature endif -ifneq (,$(findstring nrf52832, $(CPU_MODEL))) - # include common nrf52832 dependencies - include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.dep -else ifneq (,$(findstring nrf52840, $(CPU_MODEL))) - # include common nrf52840 dependencies - include $(RIOTBOARD)/common/nrf52/nrf52840/Makefile.dep +ifneq (,$(filter nrf52811xxaa nrf52820xxaa rf52833xxaa nrf52840xxaa,$(CPU_MODEL))) + # include dependencies for 802.15.4 radio + include $(RIOTBOARD)/common/nrf52/Makefile.nrf802154.dep +else + # include dependencies for BLE + include $(RIOTBOARD)/common/nrf52/Makefile.nimble.dep endif diff --git a/boards/common/nrf52/nrf52832/Makefile.dep b/boards/common/nrf52/Makefile.nimble.dep similarity index 65% rename from boards/common/nrf52/nrf52832/Makefile.dep rename to boards/common/nrf52/Makefile.nimble.dep index f2e7315787..a682d92a03 100644 --- a/boards/common/nrf52/nrf52832/Makefile.dep +++ b/boards/common/nrf52/Makefile.nimble.dep @@ -1,5 +1,5 @@ ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) - ifeq (,$(filter nrfmin,$(USEMODULE))) + ifeq (,$(filter nrfmin nrf802154,$(USEMODULE))) USEMODULE += nimble_netif endif endif diff --git a/boards/common/nrf52/nrf52840/Makefile.dep b/boards/common/nrf52/Makefile.nrf802154.dep similarity index 100% rename from boards/common/nrf52/nrf52840/Makefile.dep rename to boards/common/nrf52/Makefile.nrf802154.dep diff --git a/boards/common/nrf52/Makefile.nrfmin.dep b/boards/common/nrf52/Makefile.nrfmin.dep new file mode 100644 index 0000000000..f791e97d36 --- /dev/null +++ b/boards/common/nrf52/Makefile.nrfmin.dep @@ -0,0 +1,5 @@ +ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) + ifeq (,$(filter nimble_% nrf802154,$(USEMODULE))) + USEMODULE += nrfmin + endif +endif