From bbf64e81ec8e58229da1d6b53300e455e6fdf9d6 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Wed, 5 Aug 2015 16:06:53 +0200 Subject: [PATCH] remove defaulttransceiver, cc110x, cc2420 traces --- Makefile.pseudomodules | 1 - boards/chronos/Makefile.dep | 4 ---- boards/fox/Makefile.dep | 6 ------ boards/iot-lab_M3/Makefile.dep | 7 ------- boards/msb-430h/Makefile.dep | 8 -------- boards/msbiot/Makefile | 1 - boards/msbiot/Makefile.include | 7 ------- boards/mulle/Makefile.dep | 7 ------- boards/native/Makefile.dep | 5 ----- boards/pttu/Makefile | 1 - boards/pttu/Makefile.include | 6 ------ boards/samr21-xpro/Makefile.dep | 7 ------- boards/wsn430-v1_3b/Makefile.dep | 9 --------- boards/wsn430-v1_4/Makefile | 3 --- boards/wsn430-v1_4/Makefile.dep | 5 ----- dist/Makefile | 2 -- 16 files changed, 79 deletions(-) diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules index 58f271b60..6e579be3f 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 c08145fb9..e69de29bb 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 ab5c150ef..e69de29bb 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 6d6ad9bb5..c5fd7c234 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 ebdd277d4..e69de29bb 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 1f6f780da..37891de8e 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 30d333740..54b3e4817 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 e1be16d87..98ff416c3 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 bba8440a3..baf72ef3a 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 30ceac8ae..5503ec935 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 51dcc5a34..cb34c2c31 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 6485aaf0a..87c0062d2 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 d879e0997..4e36d0ff5 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 b906d082d..f41b2a863 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 e9314092d..4e36d0ff5 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 6fe991b12..71d06736f 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