diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-16 13:07:24 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-16 13:07:24 +0000 |
commit | 1ea7355d85e316aadfd90468b3e808bb3dc95ee9 (patch) | |
tree | 7d9c3cd8733553982b9d0a55e1ddff036a6d9b4c /demos/ARM7-LPC214x-G++ | |
parent | 51e3bee83961243f5f0ba01537630f5a3d070c36 (diff) | |
download | ChibiOS-1ea7355d85e316aadfd90468b3e808bb3dc95ee9.tar.gz ChibiOS-1ea7355d85e316aadfd90468b3e808bb3dc95ee9.tar.bz2 ChibiOS-1ea7355d85e316aadfd90468b3e808bb3dc95ee9.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1073 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARM7-LPC214x-G++')
-rw-r--r-- | demos/ARM7-LPC214x-G++/Makefile | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/demos/ARM7-LPC214x-G++/Makefile b/demos/ARM7-LPC214x-G++/Makefile index 894a37e61..5709a5dd3 100644 --- a/demos/ARM7-LPC214x-G++/Makefile +++ b/demos/ARM7-LPC214x-G++/Makefile @@ -40,21 +40,23 @@ endif PROJECT = ch
# Define linker script file here
-LDSCRIPT= ch.ld
+LDSCRIPT = ch.ld
# Imported source files
-include ../../src/kernel.mk
+include ../../os/ports/GCC/ARM7/port.mk
+include ../../os/kernel/kernel.mk
include ../../test/test.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
-CSRC = ../../ports/ARM7/chcore.c \
- ../../ports/ARM7-LPC214x/vic.c \
- ../../ports/ARM7-LPC214x/pal_lld.c \
- ../../ports/ARM7-LPC214x/lpc214x_serial.c \
+CSRC = ${PORTSRC} \
${KERNSRC} \
${TESTSRC} \
- ../../src/lib/evtimer.c \
+ ../../os/io/pal.c \
+ ../../os/ports/GCC//ARM7/LPC214x/vic.c \
+ ../../os/ports/GCC/ARM7/LPC214x/pal_lld.c \
+ ../../os/ports/GCC/ARM7/LPC214x/lpc214x_serial.c \
+ ../../os/various/evtimer.c \
board.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@@ -82,14 +84,13 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC = ../../ports/ARM7/crt0.s \
- ../../ports/ARM7-LPC214x/vectors.s \
- ../../ports/ARM7/chcoreasm.s
+ASMSRC = $(PORTASM) \
+ ../../os/ports/GCC/ARM7/LPC214x/vectors.s
-INCDIR = $(KERNINC) $(TESTINC) \
- ../../src/lib \
- ../../ports/ARM7 \
- ../../ports/ARM7-LPC214x
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+ ../../os/io \
+ ../../os/ports/GCC/ARM7/LPC214x \
+ ../../os/various
#
# Project, sources and paths
@@ -177,4 +178,4 @@ ULIBS = # End of user defines
##############################################################################
-include ../../ports/ARM/rules.mk
+include ../../os/ports/GCC/ARM/rules.mk
|