From f7f249442636f3d6c550b2db417697f39cad601f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 1 Mar 2018 16:19:34 +0100 Subject: [PATCH] Makefile.include: fix board/cpu inconsistent include order Include order for board and cpu was 1. cpu include 2. board include 3. board common includes 4. cpu common includes Its now changed to: 1. board include 2. board common includes 3. cpu include 4. cpu common includes Verifications: There are no common headers names between boards and cpus. Except native that has a 'periph_conf.h' in cpu instead of being in board. --- Makefile.include | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.include b/Makefile.include index 4d7da693b5..7407ec1d98 100644 --- a/Makefile.include +++ b/Makefile.include @@ -228,8 +228,6 @@ export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-) # Add standard include directories INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -INCLUDES += -I$(RIOTCPU)/$(CPU)/include -INCLUDES += $(addprefix -I,$(wildcard $(RIOTBOARD)/$(BOARD)/include)) # process provided features -include $(RIOTBOARD)/$(BOARD)/Makefile.features @@ -237,7 +235,11 @@ INCLUDES += $(addprefix -I,$(wildcard $(RIOTBOARD)/$(BOARD)/include)) # mandatory includes! include $(RIOTMAKE)/pseudomodules.inc.mk include $(RIOTMAKE)/defaultmodules.inc.mk + +# Include Board and CPU configuration +INCLUDES += $(addprefix -I,$(wildcard $(RIOTBOARD)/$(BOARD)/include)) include $(RIOTBOARD)/$(BOARD)/Makefile.include +INCLUDES += -I$(RIOTCPU)/$(CPU)/include include $(RIOTCPU)/$(CPU)/Makefile.include # Import all toolchain settings