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

1 files changed, 7 insertions, 9 deletions

diff --git a/demos/ARM7-AT91SAM7X-FATFS-GCC/Makefile b/demos/ARM7-AT91SAM7X-FATFS-GCC/Makefile
index 6553ef548..4b8fc0650 100644
--- a/demos/ARM7-AT91SAM7X-FATFS-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-FATFS-GCC/Makefile
@@ -39,19 +39,19 @@ endif
 # Define project name here

 PROJECT = ch

 

-# Define linker script file here

-LDSCRIPT= ch.ld

-

-# Imported source files

+# Imported source files and paths

 CHIBIOS = ../..

 include $(CHIBIOS)/boards/OLIMEX_SAM7_EX256/board.mk

 include $(CHIBIOS)/os/hal/platforms/AT91SAM7/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARM/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARM/AT91SAM7/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 include $(CHIBIOS)/ext/fatfs/fatfs.mk

 

+# Define linker script file here

+LDSCRIPT= $(PORTLD)/AT91SAM7X256.ld

+

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

 # setting.

 CSRC = $(PORTSRC) \

@@ -90,14 +90,12 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARM/AT91SAM7/vectors.s

+ASMSRC = $(PORTASM)

 

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

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

          $(FATFSINC) \

-         $(CHIBIOS)/os/various \

-         $(CHIBIOS)/os/ports/GCC/ARM/AT91SAM7

+         $(CHIBIOS)/os/various

 

 #

 # Project, sources and paths