From 1b3389efe138899953b586965b54457542df67cd Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 18 Dec 2009 15:05:45 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1436
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 .../OLIMEX_MSP430_P1611}/board.c              |  0
 .../OLIMEX_MSP430_P1611}/board.h              |  0
 boards/OLIMEX_MSP430_P1611/board.mk           |  5 +++
 demos/MSP430-MSP430x1611-GCC/Makefile         | 33 ++++++++++---------
 4 files changed, 23 insertions(+), 15 deletions(-)
 rename {demos/MSP430-MSP430x1611-GCC => boards/OLIMEX_MSP430_P1611}/board.c (100%)
 rename {demos/MSP430-MSP430x1611-GCC => boards/OLIMEX_MSP430_P1611}/board.h (100%)
 create mode 100644 boards/OLIMEX_MSP430_P1611/board.mk

diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/boards/OLIMEX_MSP430_P1611/board.c
similarity index 100%
rename from demos/MSP430-MSP430x1611-GCC/board.c
rename to boards/OLIMEX_MSP430_P1611/board.c
diff --git a/demos/MSP430-MSP430x1611-GCC/board.h b/boards/OLIMEX_MSP430_P1611/board.h
similarity index 100%
rename from demos/MSP430-MSP430x1611-GCC/board.h
rename to boards/OLIMEX_MSP430_P1611/board.h
diff --git a/boards/OLIMEX_MSP430_P1611/board.mk b/boards/OLIMEX_MSP430_P1611/board.mk
new file mode 100644
index 000000000..84acad8ed
--- /dev/null
+++ b/boards/OLIMEX_MSP430_P1611/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.
+BOARDSRC = ${CHIBIOS}/boards/OLIMEX_MSP430_P1611/board.c
+
+# Required include directories
+BOARDINC = ${CHIBIOS}/boards/OLIMEX_MSP430_P1611
diff --git a/demos/MSP430-MSP430x1611-GCC/Makefile b/demos/MSP430-MSP430x1611-GCC/Makefile
index 97de20466..647080524 100644
--- a/demos/MSP430-MSP430x1611-GCC/Makefile
+++ b/demos/MSP430-MSP430x1611-GCC/Makefile
@@ -40,20 +40,22 @@ LDSCRIPT = mspgcc/msp430x1611.x
 
 # Imported source files
 CHIBIOS = ../..
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/hal/platforms/MSP430/platform.mk
-include ${CHIBIOS}/os/ports/GCC/MSP430/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
+include $(CHIBIOS)/boards/OLIMEX_MSP430_P1611/board.mk
+include $(CHIBIOS)/os/hal/platforms/MSP430/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/MSP430/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
 
 # C sources here.
-CSRC = ${PORTSRC} \
-       ${KERNSRC} \
-       ${TESTSRC} \
-       ${HALSRC} \
-       ${PLATFORMSRC} \
-       ${CHIBIOS}/os/various/evtimer.c \
-       board.c main.c
+CSRC = $(PORTSRC) \
+       $(KERNSRC) \
+       $(TESTSRC) \
+       $(HALSRC) \
+       $(PLATFORMSRC) \
+       $(BOARDSRC) \
+       $(CHIBIOS)/os/various/evtimer.c \
+       main.c
 
 # C++ sources here.
 CPPSRC =
@@ -61,8 +63,9 @@ CPPSRC =
 # List ASM source files here
 ASMSRC = $(PORTASM)
 
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
-         ${CHIBIOS}/os/various
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+         $(CHIBIOS)/os/various
 
 #
 # Project, sources and paths
@@ -144,4 +147,4 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-include ${CHIBIOS}/os/ports/GCC/MSP430/rules.mk
+include $(CHIBIOS)/os/ports/GCC/MSP430/rules.mk