riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: include DEFAULT_MODULES from cpu and boards

Browse Source
This commit is contained in:
Oleg Hahm 2014-12-25 16:32:56 +01:00
parent 03cca0a657
commit aef6256cc5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -97,6 +97,8 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include
include $(RIOTBASE)/Makefile.dep include $(RIOTBASE)/Makefile.dep
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
ifeq ($(strip $(MCU)),) ifeq ($(strip $(MCU)),)
MCU = $(CPU) MCU = $(CPU)
endif endif

1
Makefile.modules
View File

@ -1,7 +1,6 @@
include $(RIOTBASE)/Makefile.pseudomodules include $(RIOTBASE)/Makefile.pseudomodules
include $(RIOTBASE)/Makefile.defaultmodules include $(RIOTBASE)/Makefile.defaultmodules
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE))) USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include