From 1ea7355d85e316aadfd90468b3e808bb3dc95ee9 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 16 Aug 2009 13:07:24 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1073
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARM7-AT91SAM7X-GCC/Makefile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'demos/ARM7-AT91SAM7X-GCC')

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index db19978c8..4622e181f 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -43,16 +43,18 @@ PROJECT = ch
 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-AT91SAM7X/pal_lld.c \
-       ../../ports/ARM7-AT91SAM7X/sam7x_serial.c \
+CSRC = ${PORTSRC} \
        ${KERNSRC} \
        ${TESTSRC} \
+       ../../os/io/pal.c \
+       ../../os/ports/GCC/ARM7/AT91SAM7X/pal_lld.c \
+       ../../os/ports/GCC/ARM7/AT91SAM7X/sam7x_serial.c \
        at91lib/aic.c \
        board.c main.c
 
@@ -81,14 +83,13 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = ../../ports/ARM7/crt0.s \
-         ../../ports/ARM7-AT91SAM7X/vectors.s \
-         ../../ports/ARM7/chcoreasm.s
+ASMSRC = $(PORTASM) \
+         ../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s
 
-INCDIR = $(KERNINC) $(TESTINC) \
-         ../../src/lib \
-         ../../ports/ARM7 \
-         ../../ports/ARM7-AT91SAM7X
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+         ../../os/io \
+         ../../os/ports/GCC/ARM7/AT91SAM7X \
+         ../../os/various
 
 #
 # Project, sources and paths
@@ -176,4 +177,4 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-include ../../ports/ARM/rules.mk
+include ../../os/ports/GCC/ARM/rules.mk
-- 
cgit v1.2.3