Merge pull request #1917 from OlegHahm/config_feature_cleanup

Config feature cleanup
RIOT-OS · Dec 30, 2014 · e60d25d · e60d25d
2 parents e6c4181 + aef6256
commit e60d25d
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 9 deletions.
diff --git a/Makefile.include b/Makefile.include
@@ -97,6 +97,8 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
 include $(RIOTCPU)/$(CPU)/Makefile.include
 include $(RIOTBASE)/Makefile.dep
 
+USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
+
 ifeq ($(strip $(MCU)),)
 	MCU = $(CPU)
 endif

diff --git a/Makefile.modules b/Makefile.modules
@@ -1,7 +1,7 @@
 include $(RIOTBASE)/Makefile.pseudomodules
 include $(RIOTBASE)/Makefile.defaultmodules
 
-USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
+USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE)))
 
 INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
 ED = $(patsubst %,-DMODULE_%,$(subst -,_,$(USEMODULE) $(USEPKG)))

diff --git a/boards/chronos/Makefile.features b/boards/chronos/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED = transceiver periph_rtc
+FEATURES_PROVIDED += transceiver periph_rtc
diff --git a/boards/msb-430h/Makefile.features b/boards/msb-430h/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver
+FEATURES_PROVIDED += transceiver config
diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver periph_pwm periph_rtc cpp
+FEATURES_PROVIDED += transceiver periph_pwm periph_rtc cpp config
diff --git a/boards/native/Makefile.features b/boards/native/Makefile.features
@@ -1,3 +1,3 @@
-FEATURES_PROVIDED += transceiver periph_cpuid cpp
+FEATURES_PROVIDED += transceiver periph_cpuid config cpp
 FEATURES_PROVIDED += periph_random
 FEATURES_PROVIDED += periph_rtc
diff --git a/boards/wsn430-v1_3b/Makefile.features b/boards/wsn430-v1_3b/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver
+FEATURES_PROVIDED += transceiver config
diff --git a/boards/wsn430-v1_4/Makefile.features b/boards/wsn430-v1_4/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver
+FEATURES_PROVIDED += transceiver config
diff --git a/drivers/at86rf231/at86rf231.c b/drivers/at86rf231/at86rf231.c
@@ -27,6 +27,7 @@
 #include "kernel_types.h"
 #include "transceiver.h"
 #include "hwtimer.h"
+#include "config.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"

diff --git a/examples/default/Makefile b/examples/default/Makefile
@@ -35,8 +35,10 @@ USEMODULE += shell_commands
 USEMODULE += ps
 USEMODULE += vtimer
 USEMODULE += defaulttransceiver
+USEMODULE += config
 
 FEATURES_OPTIONAL += transceiver
+FEATURES_OPTIONAL += config
 FEATURES_OPTIONAL += periph_rtc
 
 ifneq (,$(filter msb-430,$(BOARD)))
@@ -46,12 +48,10 @@ ifneq (,$(filter msba2,$(BOARD)))
 	USEMODULE += sht11
 	USEMODULE += ltc4150
 	USEMODULE += mci
-	USEMODULE += config
 	USEMODULE += random
 endif
 ifneq (,$(filter native,$(BOARD)))
 	USEMODULE += ltc4150
-	USEMODULE += config
 	USEMODULE += random
 endif
 ifneq (,$(filter iot-lab_M3,$(BOARD)))
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FEATURES_PROVIDED = transceiver periph_rtc
		FEATURES_PROVIDED += transceiver periph_rtc
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FEATURES_PROVIDED += transceiver
		FEATURES_PROVIDED += transceiver config