From aef6256cc5aaa6b0e84bc59aa1fd42d0033a33fd Mon Sep 17 00:00:00 2001 From: Oleg Hahm <oleg@hobbykeller.org> Date: Thu, 25 Dec 2014 16:32:56 +0100 Subject: [PATCH] make: include DEFAULT_MODULES from cpu and boards --- Makefile.include | 2 ++ Makefile.modules | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.include b/Makefile.include index f9c8305145..5b08f84632 100644 --- 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 index 6e75fb9a81..5f21180645 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -1,7 +1,6 @@ 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 -- GitLab