summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2006-09-11 16:55:11 +0000
committerPaul Brook <paul@codesourcery.com>2006-09-11 16:55:11 +0000
commit51cecb1579452e7dc701afd02741adb5d3f95cb7 (patch)
tree36dffc4762fd1b44438de5df09fc0777f8ea3591
parentb773f177d3c1c322d0e637c5144e14953bd29a03 (diff)
downloadcygnal-51cecb1579452e7dc701afd02741adb5d3f95cb7.tar.gz
cygnal-51cecb1579452e7dc701afd02741adb5d3f95cb7.tar.bz2
cygnal-51cecb1579452e7dc701afd02741adb5d3f95cb7.zip
2006-09-11 Daniel Jacobowitz <dan@codesourcery.com>
libgloss/ * arm/Makefile.in (armv7m, lm3s10x, lm3s301, lm3s31x): Swap RAM and ROM. (rdimon, rdpmon): Skip 8k.
-rw-r--r--ChangeLog.csl7
-rw-r--r--libgloss/arm/Makefile.in21
2 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 7bed53d29..5251e4f5c 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-09-11 Daniel Jacobowitz <dan@codesourcery.com>
+
+ libgloss/
+ * arm/Makefile.in (armv7m, lm3s10x, lm3s301, lm3s31x): Swap
+ RAM and ROM.
+ (rdimon, rdpmon): Skip 8k.
+
2006-09-06 Nathan Sidwell <nathan@codesourcery.com>
libgloss/
diff --git a/libgloss/arm/Makefile.in b/libgloss/arm/Makefile.in
index 8b16860ac..e081234fb 100644
--- a/libgloss/arm/Makefile.in
+++ b/libgloss/arm/Makefile.in
@@ -133,15 +133,18 @@ $(RDIMON_BSP): $(RDIMON_OBJS)
${AR} ${ARFLAGS} $@ $^
${RANLIB} $@
-# Armv7M board files.
-# ram rom stack crt0 bsp
-# position size position size
-rdimon= 0 4095M 0 0 no rdimon-crt0.o -lrdimon
-rdpmon= 0 4095M 0 0 no rdpmon-crt0.o -lrdpmon
-armv7m= 0 32M 0x20000000 32M no armv7m-crt0.o -lrdimon
-lm3s10x= 0 2k 0x20000000 8k yes armv7m-crt0.o -lrdimon
-lm3s301= 0 2k 0x20000000 16k yes armv7m-crt0.o -lrdimon
-lm3s31x= 0 4k 0x20000000 16k yes armv7m-crt0.o -lrdimon
+# Default and armv7M board files.
+# For RAM configurations which start at zero, skip 8k. This prevents
+# the simulator from getting confused about whether we have our own
+# SWI vectors.
+# ram rom stack crt0 bsp
+# position size position size
+rdimon= 0x8000 4095M 0 0 no rdimon-crt0.o -lrdimon
+rdpmon= 0x8000 4095M 0 0 no rdpmon-crt0.o -lrdpmon
+armv7m= 0x20000000 32M 0 32M no armv7m-crt0.o -lrdimon
+lm3s10x= 0x20000000 2k 0 8k yes armv7m-crt0.o -lrdimon
+lm3s301= 0x20000000 2k 0 16k yes armv7m-crt0.o -lrdimon
+lm3s31x= 0x20000000 4k 0 16k yes armv7m-crt0.o -lrdimon
%-ram.ld : arm.sc Makefile
RAM=$(word 1,$($*)) RAM_SIZE=$(word 2,$($*)) \