From c531d157e300bddf0e75b40bce2b4dce54a5a575 Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Wed, 16 Sep 2015 17:18:10 +0200
Subject: [PATCH] boards/msb-430xx: Makefile cleanup

---
 boards/msb-430-common/Makefile.include | 41 +++++++++++---------------
 boards/msb-430/Makefile.include        |  1 -
 boards/msb-430h/Makefile.dep           |  0
 boards/msb-430h/Makefile.include       |  3 --
 4 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 boards/msb-430h/Makefile.dep

diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index 62162174c5..14a69653e7 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -1,37 +1,32 @@
 ## the cpu to build for
 export CPU = msp430fxyz
-export MCU = msp430f1612
+export CPU_MODEL = msp430f1612
 
-# toolchain config
-export PREFIX = msp430-
-export CC = $(PREFIX)gcc
-export AR = $(PREFIX)ar
-export CFLAGS += -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU)
-export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2
-export AS = $(PREFIX)as
-export LINK = $(PREFIX)gcc
-export SIZE = $(PREFIX)size
-export OBJCOPY = $(PREFIX)objcopy
-export LINKFLAGS += -mmcu=$(MCU) -lgcc
-TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm
+# set default port depending on operating system
+PORT_LINUX ?= /dev/ttyUSB0
+PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
+# setup serial terminal
+include $(RIOTBOARD)/Makefile.include.serial
 
-export FLASHER ?= mspdebug
-export PORT ?= /dev/ttyUSB0
+# setup flash tool
+export OFLAGS = -O ihex
 export PROGRAMMER ?= olimex
 export MSPDEBUGFLAGS += -j $(PROGRAMMER)
 ifeq ($(strip $(PROGRAMMER)),uif)
-	export MSPDEBUGFLAGS += -d $(PORT)
+    export MSPDEBUGFLAGS += -d $(PORT)
 endif
+export FLASHER ?= mspdebug
+export FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"
+
+# setup debugger
 export DEBUGSERVER = $(FLASHER)
 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)
-export TERMFLAGS += -p "$(PORT)"
-
-export FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"
 
-export USEMODULE += msp430_common
-export INCLUDES += -I$(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include
-export OFLAGS = -O ihex
+# include msp430 base makefile
+include $(RIOTBOARD)/Makefile.include.msp430_common
 
-export UNDEF += $(BINDIR)msp430_common/startup.o
+# 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/msb-430/Makefile.include b/boards/msb-430/Makefile.include
index b16394458f..c42b46b063 100644
--- a/boards/msb-430/Makefile.include
+++ b/boards/msb-430/Makefile.include
@@ -1,2 +1 @@
-export INCLUDES += -I$(RIOTBOARD)/msb-430/include
 include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/boards/msb-430h/Makefile.include b/boards/msb-430h/Makefile.include
index 10ae080875..c42b46b063 100644
--- a/boards/msb-430h/Makefile.include
+++ b/boards/msb-430h/Makefile.include
@@ -1,4 +1 @@
-export INCLUDES += -I$(RIOTBOARD)/msb-430h/include
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
-
 include $(RIOTBOARD)/msb-430-common/Makefile.include
-- 
GitLab