From 717d89899fc794db06642cdd5f98e08692fe23a9 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:41:13 +0100
Subject: [PATCH] make: Move Makefile.msp430_common to cpu dir
---
boards/chronos/Makefile.include | 3 ---
boards/msb-430-common/Makefile.include | 3 ---
boards/telosb/Makefile.include | 3 ---
boards/wsn430-common/Makefile.include | 3 ---
boards/z1/Makefile.include | 3 ---
{boards => cpu}/Makefile.include.msp430_common | 0
cpu/msp430-common/Makefile.include | 3 +++
7 files changed, 3 insertions(+), 15 deletions(-)
rename {boards => cpu}/Makefile.include.msp430_common (100%)
diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index af3734e43d..751e7b0d39 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -7,7 +7,4 @@ export OFLAGS = -O ihex
export FLASHER = mspdebug
export FFLAGS = rf2500 "prog $(HEXFILE)"
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
-
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index 14a69653e7..f20ca282b1 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -24,9 +24,6 @@ export DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
export DEBUGGER = $(PREFIX)gdb
export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt" $(ELFFILE)
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
-
# export msb-430-common includes
export INCLUDES += -I$(RIOTBOARD)/msb-430-common/include
export INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index dee5865eaa..22a5df72f7 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -12,6 +12,3 @@ include $(RIOTBOARD)/Makefile.include.serial
export OFLAGS = -O ihex
export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl
export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
-
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include
index 641220d8af..51ed52b66a 100644
--- a/boards/wsn430-common/Makefile.include
+++ b/boards/wsn430-common/Makefile.include
@@ -13,8 +13,5 @@ export OFLAGS = -O ihex
export FLASHER = mspdebug
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
-
# include wsn430-common includes
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
index cacdf64530..b909dd2e85 100644
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@@ -12,6 +12,3 @@ include $(RIOTBOARD)/Makefile.include.serial
export OFLAGS = -O ihex
export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl
export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
-
-# include the msp430 common Makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
diff --git a/boards/Makefile.include.msp430_common b/cpu/Makefile.include.msp430_common
similarity index 100%
rename from boards/Makefile.include.msp430_common
rename to cpu/Makefile.include.msp430_common
diff --git a/cpu/msp430-common/Makefile.include b/cpu/msp430-common/Makefile.include
index 482487382c..c82d22e331 100644
--- a/cpu/msp430-common/Makefile.include
+++ b/cpu/msp430-common/Makefile.include
@@ -4,3 +4,6 @@ export UNDEF += $(BINDIR)msp430_common/startup.o
export USEMODULE += msp430_common
DEFAULT_MODULE += oneway_malloc
+
+# include the msp430 common Makefile
+include $(RIOTCPU)/Makefile.include.msp430_common
--
GitLab