From fe5c982fa66f09a4799f8fca3f370af5675dab65 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Fri, 29 Jan 2021 13:28:30 +0100 Subject: [PATCH] drivers/Makefile.dep: don't pull netdev on netdev_default netdev_default should enable the network devices, which do not necessarily use netdev. --- drivers/Makefile.dep | 2 +- pkg/lwip/Makefile.dep | 1 + pkg/openthread/Makefile.dep | 5 +---- pkg/openwsn/Makefile.dep | 2 ++ sys/Makefile.dep | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/Makefile.dep b/drivers/Makefile.dep index 65537ebd81..92e57c4494 100644 --- a/drivers/Makefile.dep +++ b/drivers/Makefile.dep @@ -197,7 +197,7 @@ ifneq (,$(filter periph_timer_periodic,$(USEMODULE))) FEATURES_REQUIRED += periph_timer endif -ifneq (,$(filter netdev_%,$(USEMODULE))) +ifneq (,$(filter-out netdev_default, $(filter netdev_%,$(USEMODULE)))) USEMODULE += netdev # Don't register netdevs if there is only a single one of them ifeq (,$(filter gnrc_netif_single,$(USEMODULE))) diff --git a/pkg/lwip/Makefile.dep b/pkg/lwip/Makefile.dep index 62d932f3b6..2179cfbbc6 100644 --- a/pkg/lwip/Makefile.dep +++ b/pkg/lwip/Makefile.dep @@ -63,6 +63,7 @@ ifneq (,$(filter lwip_%,$(USEMODULE))) USEMODULE += lwip_contrib USEMODULE += lwip_core USEMODULE += lwip_netif + USEMODULE += netdev ifeq (,$(filter lwip_ipv4 lwip_ipv6,$(USEMODULE))) USEMODULE += lwip_ipv4 endif diff --git a/pkg/openthread/Makefile.dep b/pkg/openthread/Makefile.dep index bff5bf798c..1ddb74aef2 100644 --- a/pkg/openthread/Makefile.dep +++ b/pkg/openthread/Makefile.dep @@ -1,12 +1,9 @@ USEMODULE += openthread_contrib +USEMODULE += netdev USEMODULE += openthread_contrib_netdev USEMODULE += l2util USEMODULE += xtimer USEMODULE += event -ifneq (,$(filter cc2538_rf nrf802154,$(USEMODULE))) - USEMODULE += netdev_ieee802154_submac -endif - FEATURES_REQUIRED += cpp diff --git a/pkg/openwsn/Makefile.dep b/pkg/openwsn/Makefile.dep index 2ed2db6eae..e071fe7dd8 100644 --- a/pkg/openwsn/Makefile.dep +++ b/pkg/openwsn/Makefile.dep @@ -49,7 +49,9 @@ ifneq (,$(filter openwsn_crypto,$(USEMODULE))) endif ifneq (,$(filter openwsn_radio,$(USEMODULE))) + # enable default network devices on the platform USEMODULE += netdev_default + USEMODULE += netdev USEMODULE += luid ifneq (,$(filter cc2538_rf nrf802154,$(USEMODULE))) USEMODULE += openwsn_radio_hal diff --git a/sys/Makefile.dep b/sys/Makefile.dep index 22c395fba7..58633dc85f 100644 --- a/sys/Makefile.dep +++ b/sys/Makefile.dep @@ -147,7 +147,9 @@ ifneq (,$(filter ieee802154_radio_hal,$(USEMODULE))) endif ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) + # enable default network devices on the platform USEMODULE += netdev_default + USEMODULE += netdev USEMODULE += gnrc_netif endif