From 6bebc9d5884acf1795cf674471675e73d406ec8f Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Wed, 6 Apr 2016 15:39:34 +0200 Subject: [PATCH] make: moved driver deps to drivers/Makefile.deps --- Makefile.dep | 30 ------------------------------ drivers/Makefile.dep | 22 +++++++++++++++++++++- 2 files changed, 21 insertions(+), 31 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 178b3c9a52..283a83df2d 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -10,7 +10,6 @@ ifneq (,$(filter ccn-lite,$(USEPKG))) export CFLAGS += -DCCNL_RIOT endif - ifneq (,$(filter nhdp,$(USEMODULE))) USEMODULE += conn_udp USEMODULE += xtimer @@ -22,30 +21,6 @@ ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) USEMODULE += netdev_default endif -ifneq (,$(filter cc110x,$(USEMODULE))) - ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) - USEMODULE += gnrc_cc110x - # XXX: this can be modelled as a dependency for gnrc_netdev_default as soon - # as all drivers are ported to netdev2 - USEMODULE += gnrc_netdev2 - endif -endif - -ifneq (,$(filter kw2xrf,$(USEMODULE))) - ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) - USEMODULE += gnrc_nomac - endif -endif - -ifneq (,$(filter at86rf2%,$(USEMODULE))) - USEMODULE += netdev2_ieee802154 - ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) - # XXX: this can be modelled as a dependency for gnrc_netdev_default as soon - # as all drivers are ported to netdev2 - USEMODULE += gnrc_netdev2 - endif -endif - ifneq (,$(filter netdev2_ieee802154,$(USEMODULE))) USEMODULE += ieee802154 endif @@ -561,11 +536,6 @@ ifneq (,$(filter phydat,$(USEMODULE))) USEMODULE += fmt endif -ifneq (,$(filter ethos,$(USEMODULE))) - USEMODULE += netdev2_eth - USEMODULE += random -endif - ifneq (,$(filter random,$(USEMODULE))) # select default prng ifeq (,$(filter prng_%,$(USEMODULE))) diff --git a/drivers/Makefile.dep b/drivers/Makefile.dep index 778ba90343..67b9c20942 100644 --- a/drivers/Makefile.dep +++ b/drivers/Makefile.dep @@ -6,9 +6,15 @@ endif ifneq (,$(filter at86rf2%,$(USEMODULE))) USEMODULE += at86rf2xx - USEMODULE += ieee802154 USEMODULE += xtimer USEMODULE += netif + USEMODULE += ieee802154 + USEMODULE += netdev2_ieee802154 + ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) + # XXX: this can be modelled as a dependency for gnrc_netdev_default as soon + # as all drivers are ported to netdev2 + USEMODULE += gnrc_netdev2 + endif endif ifneq (,$(filter bh1750fvi,$(USEMODULE))) @@ -18,6 +24,12 @@ endif ifneq (,$(filter cc110x,$(USEMODULE))) USEMODULE += ieee802154 + ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) + USEMODULE += gnrc_cc110x + # XXX: this can be modelled as a dependency for gnrc_netdev_default as soon + # as all drivers are ported to netdev2 + USEMODULE += gnrc_netdev2 + endif endif ifneq (,$(filter dht,$(USEMODULE))) @@ -35,6 +47,11 @@ ifneq (,$(filter encx24j600,$(USEMODULE))) USEMODULE += xtimer endif +ifneq (,$(filter ethos,$(USEMODULE))) + USEMODULE += netdev2_eth + USEMODULE += random +endif + ifneq (,$(filter hih6130,$(USEMODULE))) USEMODULE += xtimer endif @@ -42,6 +59,9 @@ endif ifneq (,$(filter kw2xrf,$(USEMODULE))) USEMODULE += ieee802154 USEMODULE += netif + ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) + USEMODULE += gnrc_nomac + endif endif ifneq (,$(filter lm75a,$(USEMODULE)))