diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules index 58f271b603..6e579be3f5 100644 --- a/Makefile.pseudomodules +++ b/Makefile.pseudomodules @@ -1,4 +1,3 @@ -PSEUDOMODULES += defaulttransceiver PSEUDOMODULES += ng_netif_default PSEUDOMODULES += ng_ieee802154 PSEUDOMODULES += ng_ipv6_default diff --git a/boards/chronos/Makefile.dep b/boards/chronos/Makefile.dep index c08145fb9e..e69de29bb2 100644 --- a/boards/chronos/Makefile.dep +++ b/boards/chronos/Makefile.dep @@ -1,4 +0,0 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += cc110x_legacy - USEMODULE += transceiver -endif diff --git a/boards/fox/Makefile.dep b/boards/fox/Makefile.dep index ab5c150ef0..e69de29bb2 100644 --- a/boards/fox/Makefile.dep +++ b/boards/fox/Makefile.dep @@ -1,6 +0,0 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += at86rf231 - ifeq (,$(filter netdev_base,$(USEMODULE))) - USEMODULE += transceiver - endif -endif diff --git a/boards/iot-lab_M3/Makefile.dep b/boards/iot-lab_M3/Makefile.dep index 6d6ad9bb54..c5fd7c2342 100644 --- a/boards/iot-lab_M3/Makefile.dep +++ b/boards/iot-lab_M3/Makefile.dep @@ -1,10 +1,3 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += at86rf231 - ifeq (,$(filter netdev_base,$(USEMODULE))) - USEMODULE += transceiver - endif -endif - ifneq (,$(filter ng_netif_default,$(USEMODULE))) USEMODULE += ng_at86rf231 USEMODULE += ng_nomac diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep index ebdd277d4c..e69de29bb2 100644 --- a/boards/msb-430h/Makefile.dep +++ b/boards/msb-430h/Makefile.dep @@ -1,8 +0,0 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += cc110x_legacy - USEMODULE += transceiver -endif - -ifneq (,$(filter cc110x_legacy,$(USEMODULE))) - USEMODULE += cc110x_spi -endif diff --git a/boards/msbiot/Makefile b/boards/msbiot/Makefile index 1f6f780dab..37891de8e6 100644 --- a/boards/msbiot/Makefile +++ b/boards/msbiot/Makefile @@ -1,5 +1,4 @@ # tell the Makefile.base which module to build MODULE = $(BOARD)_base -INCLUDES += -I$(RIOTBASE)/drivers/cc110x include $(RIOTBASE)/Makefile.base diff --git a/boards/msbiot/Makefile.include b/boards/msbiot/Makefile.include index 30d333740d..54b3e4817e 100644 --- a/boards/msbiot/Makefile.include +++ b/boards/msbiot/Makefile.include @@ -2,13 +2,6 @@ export CPU = stm32f4 export CPU_MODEL = stm32f415rg -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += cc110x - ifeq (,$(filter netdev_base,$(USEMODULE))) - USEMODULE += transceiver - endif -endif - #define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1) diff --git a/boards/mulle/Makefile.dep b/boards/mulle/Makefile.dep index e1be16d873..98ff416c3a 100644 --- a/boards/mulle/Makefile.dep +++ b/boards/mulle/Makefile.dep @@ -1,10 +1,3 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += at86rf231 - ifeq (,$(filter netdev_base,$(USEMODULE))) - USEMODULE += transceiver - endif -endif - ifneq (,$(filter ng_netif_default,$(USEMODULE))) USEMODULE += ng_at86rf212b USEMODULE += ng_nomac diff --git a/boards/native/Makefile.dep b/boards/native/Makefile.dep index bba8440a32..baf72ef3a3 100644 --- a/boards/native/Makefile.dep +++ b/boards/native/Makefile.dep @@ -1,8 +1,3 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += ng_nativenet - USEMODULE += ng_netdev_eth -endif - ifneq (,$(filter ng_netif_default,$(USEMODULE))) USEMODULE += ng_nativenet USEMODULE += ng_netdev_eth diff --git a/boards/pttu/Makefile b/boards/pttu/Makefile index 30ceac8ae1..5503ec9358 100644 --- a/boards/pttu/Makefile +++ b/boards/pttu/Makefile @@ -1,5 +1,4 @@ MODULE =$(BOARD)_base -INCLUDES += -I$(RIOTBASE)/drivers/cc110x_legacy_csma DIRS = $(RIOTBOARD)/msba2-common diff --git a/boards/pttu/Makefile.include b/boards/pttu/Makefile.include index 51dcc5a34d..cb34c2c317 100644 --- a/boards/pttu/Makefile.include +++ b/boards/pttu/Makefile.include @@ -1,9 +1,3 @@ export INCLUDES += -I$(RIOTBOARD)/pttu/include -# Enable this after fixing https://github.com/RIOT-OS/RIOT/issues/659 -#ifneq (,$(filter defaulttransceiver,$(USEMODULE))) -# USEMODULE += cc110x_legacy_csma -# USEMODULE += transceiver -#endif - include $(RIOTBOARD)/msba2-common/Makefile.include diff --git a/boards/samr21-xpro/Makefile.dep b/boards/samr21-xpro/Makefile.dep index 6485aaf0aa..87c0062d23 100644 --- a/boards/samr21-xpro/Makefile.dep +++ b/boards/samr21-xpro/Makefile.dep @@ -1,10 +1,3 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += at86rf231 - ifeq (,$(filter netdev_base,$(USEMODULE))) - USEMODULE += transceiver - endif -endif - ifneq (,$(filter ng_netif_default,$(USEMODULE))) USEMODULE += ng_at86rf233 USEMODULE += ng_nomac diff --git a/boards/wsn430-v1_3b/Makefile.dep b/boards/wsn430-v1_3b/Makefile.dep index d879e0997a..4e36d0ff56 100644 --- a/boards/wsn430-v1_3b/Makefile.dep +++ b/boards/wsn430-v1_3b/Makefile.dep @@ -1,10 +1 @@ -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += cc110x_legacy - USEMODULE += transceiver -endif - -ifneq (,$(filter cc110x_legacy,$(USEMODULE))) - USEMODULE += cc110x_spi -endif - USEMODULE += msp430_common diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile index b906d082de..f41b2a8634 100644 --- a/boards/wsn430-v1_4/Makefile +++ b/boards/wsn430-v1_4/Makefile @@ -2,7 +2,4 @@ MODULE = $(BOARD)_base DIRS = $(RIOTBOARD)/wsn430-common -INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \ - -I$(RIOTBASE)/sys/net/include - include $(RIOTBASE)/Makefile.base diff --git a/boards/wsn430-v1_4/Makefile.dep b/boards/wsn430-v1_4/Makefile.dep index e9314092db..4e36d0ff56 100644 --- a/boards/wsn430-v1_4/Makefile.dep +++ b/boards/wsn430-v1_4/Makefile.dep @@ -1,6 +1 @@ USEMODULE += msp430_common - -ifneq (,$(filter defaulttransceiver,$(USEMODULE))) - USEMODULE += cc2420 - USEMODULE += transceiver -endif diff --git a/dist/Makefile b/dist/Makefile index 6fe991b12e..71d06736f2 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -36,8 +36,6 @@ QUIET ?= 1 #USEMODULE += uart0 #USEMODULE += posix #USEMODULE += vtimer -#USEMODULE += defaulttransceiver -#USEMODULE += sixlowpan #export INCLUDES += -Iapplication_include