git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1357 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 5 insertions, 8 deletions

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index aa4adb2ac..0dd999e7a 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -44,6 +44,8 @@ LDSCRIPT= ch.ld
 

 # Imported source files

 CHIBIOS = ../..

+include ${CHIBIOS}/os/hal/hal.mk

+include ${CHIBIOS}/os/hal/platforms/AT91SAM7/platform.mk

 include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk

 include ${CHIBIOS}/os/kernel/kernel.mk

 include ${CHIBIOS}/test/test.mk

@@ -53,11 +55,8 @@ include ${CHIBIOS}/test/test.mk
 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ${CHIBIOS}/os/io/pal.c \

-       ${CHIBIOS}/os/io/serial.c \

-       ${CHIBIOS}/os/io/platforms/AT91SAM7/pal_lld.c \

-       ${CHIBIOS}/os/io/platforms/AT91SAM7/serial_lld.c \

-       ${CHIBIOS}/os/io/platforms/AT91SAM7/at91lib/aic.c \

+       ${HALSRC} \

+       ${PLATFORMSRC} \

        board.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -88,9 +87,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM) \

          ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7/vectors.s

 

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ${CHIBIOS}/os/io \

-         ${CHIBIOS}/os/io/platforms/AT91SAM7 \

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \

          ${CHIBIOS}/os/various \

          ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7