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-AT91SAM7X-WEB-GCC/Makefile | |
| 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-AT91SAM7X-WEB-GCC/Makefile')
| -rw-r--r-- | demos/ARM7-AT91SAM7X-WEB-GCC/Makefile | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile index 4b0aad5a1..0e881c364 100644 --- a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile +++ b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile @@ -43,7 +43,8 @@ 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
# List of the required uIP source files.
@@ -57,14 +58,15 @@ USRC = ../../ext/uip-1.0/uip/uip_arp.c \ # 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 \
- ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \
+CSRC = ${PORTSRC} \
${KERNSRC} \
${TESTSRC} \
${USRC} \
- ../../src/lib/evtimer.c \
+ ../../os/io/pal.c \
+ ../../os/ports/GCC/ARM7/AT91SAM7X/pal_lld.c \
+ ../../os/ports/GCC/ARM7/AT91SAM7X/sam7x_serial.c \
+ ../../os/ports/GCC/ARM7/AT91SAM7X/sam7x_emac.c \
+ ../../os/various/evtimer.c \
at91lib/aic.c \
web/webthread.c \
board.c main.c
@@ -94,14 +96,13 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC = ../../ports/ARM7/crt0.s \
- ../../ports/ARM7-AT91SAM7X/vectors.s \
- ../../ports/ARM7/chcoreasm.s
-
-INCDIR = $(KERNINC) $(TESTINC) \
- ../../src/lib \
- ../../ports/ARM7 \
- ../../ports/ARM7-AT91SAM7X \
+ASMSRC = $(PORTASM) \
+ ../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s
+
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+ ../../os/io \
+ ../../os/ports/GCC/ARM7/AT91SAM7X \
+ ../../os/various \
./web ../../ext/uip-1.0/uip ../../ext/uip-1.0/apps/webserver
#
@@ -190,4 +191,4 @@ ULIBS = # End of user defines
##############################################################################
-include ../../ports/ARM/rules.mk
+include ../../os/ports/GCC/ARM/rules.mk
|