aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2008-10-04 09:53:06 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2008-10-04 09:53:06 +0000
commit63c5df56a93280ff24010066b2dabd006995ac62 (patch)
tree0813526fd2738c3eb4a28a292181bd7a39df1181 /demos
parent215de527a7627a67af2d2b0f6b4882497a299efc (diff)
downloadChibiOS-63c5df56a93280ff24010066b2dabd006995ac62.tar.gz
ChibiOS-63c5df56a93280ff24010066b2dabd006995ac62.tar.bz2
ChibiOS-63c5df56a93280ff24010066b2dabd006995ac62.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@453 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/Makefile3
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/Makefile.thumb3
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/ch.ld2
3 files changed, 5 insertions, 3 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index 5629c9842..dbdca2c31 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -83,7 +83,8 @@ ASRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
TSRC =
# List ASM source files here
-ASMSRC = ../../ports/ARM7-AT91SAM7X/crt0.s ../../ports/ARM7/chsys.s
+ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chsys.s \
+ ../../ports/ARM7-AT91SAM7X/vectors.s
# List all user directories here
UINCDIR = ../../src/include ../../src/lib ../../test \
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
index 4ca9bded5..3013eeb95 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
@@ -83,7 +83,8 @@ TSRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
board.c main.c
# List ASM source files here
-ASMSRC = ../../ports/ARM7-AT91SAM7X/crt0.s ../../ports/ARM7/chsys.s
+ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chsys.s \
+ ../../ports/ARM7-AT91SAM7X/vectors.s
# List all user directories here
UINCDIR = ../../src/include ../../src/lib ../../test \
diff --git a/demos/ARM7-AT91SAM7X-GCC/ch.ld b/demos/ARM7-AT91SAM7X-GCC/ch.ld
index 7459bdac1..89a2c2f2b 100644
--- a/demos/ARM7-AT91SAM7X-GCC/ch.ld
+++ b/demos/ARM7-AT91SAM7X-GCC/ch.ld
@@ -45,7 +45,7 @@ SECTIONS
.text :
{
_text = .;
- KEEP(*(.startup))
+ KEEP(*(vectors));
*(.text)
*(.text.*);
*(.rodata);