From 31c9ca70e5bb4d655d90836ac19bb45a4a044c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se> Date: Wed, 10 Feb 2016 07:44:47 +0100 Subject: [PATCH] make: Move Makefile.include.$(TOOLCHAIN) to cpu dir --- cpu/Makefile.include.cortexm_common | 2 +- {boards => cpu}/Makefile.include.gnu | 0 {boards => cpu}/Makefile.include.llvm | 0 cpu/Makefile.include.msp430_common | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {boards => cpu}/Makefile.include.gnu (100%) rename {boards => cpu}/Makefile.include.llvm (100%) diff --git a/cpu/Makefile.include.cortexm_common b/cpu/Makefile.include.cortexm_common index c19cf959d2..f7d20a35cd 100644 --- a/cpu/Makefile.include.cortexm_common +++ b/cpu/Makefile.include.cortexm_common @@ -118,7 +118,7 @@ endif include $(RIOTCPU)/cortexm_common/Makefile.include # Import all toolchain settings -include $(RIOTBOARD)/Makefile.include.$(TOOLCHAIN) +include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN) # use the nano-specs of Newlib when available ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0) diff --git a/boards/Makefile.include.gnu b/cpu/Makefile.include.gnu similarity index 100% rename from boards/Makefile.include.gnu rename to cpu/Makefile.include.gnu diff --git a/boards/Makefile.include.llvm b/cpu/Makefile.include.llvm similarity index 100% rename from boards/Makefile.include.llvm rename to cpu/Makefile.include.llvm diff --git a/cpu/Makefile.include.msp430_common b/cpu/Makefile.include.msp430_common index 5b9014b8e0..e0cbe468d7 100644 --- a/cpu/Makefile.include.msp430_common +++ b/cpu/Makefile.include.msp430_common @@ -15,4 +15,4 @@ export ASFLAGS += $(CFLAGS_CPU) --defsym $(CPU_MODEL)=1 $(CFLAGS_DEBUG) export LINKFLAGS += $(CFLAGS_CPU) -lgcc # Import all toolchain settings -include $(RIOTBOARD)/Makefile.include.gnu +include $(RIOTCPU)/Makefile.include.gnu -- GitLab