From cadf83110acc18314197ace9e3d5083a99e3fdb8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 16 May 2008 15:09:49 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@292
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARM7-AT91SAM7X-GCC/ch.ld | 2 +-
 docs/Doxyfile                  | 2 +-
 docs/index.html                | 2 +-
 ports/ARM7-AT91SAM7X/crt0.s    | 5 +++--
 ports/ARM7-LPC214x/crt0.s      | 5 +++--
 ports/ARMCM3/crt0.s            | 4 ++--
 readme.txt                     | 4 ++--
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/demos/ARM7-AT91SAM7X-GCC/ch.ld b/demos/ARM7-AT91SAM7X-GCC/ch.ld
index 847340cb4..541c73b5b 100644
--- a/demos/ARM7-AT91SAM7X-GCC/ch.ld
+++ b/demos/ARM7-AT91SAM7X-GCC/ch.ld
@@ -30,7 +30,7 @@ __stacks_total_size__	= __und_stack_size__ + __abt_stack_size__ + __fiq_stack_si
 
 MEMORY
 {
-	flash : org = 0x000000, len = 256k
+	flash : org = 0x100000, len = 256k
 	ram : org = 0x200020, len = 64k - 0x20
 }
 
diff --git a/docs/Doxyfile b/docs/Doxyfile
index e03d57654..0f44238a0 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "0.6.4 beta"
+PROJECT_NUMBER         = "0.6.5 beta"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/docs/index.html b/docs/index.html
index 07d2e6a37..a5e391e8d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
     </tr>
     <tr>
       <td style="text-align: center; vertical-align: top; width: 150px;">Current
-Version 0.6.4<br>
+Version 0.6.5<br>
 -<br>
       <a href="http://sourceforge.net/projects/chibios/" rel="me" target="_top">Project on SourceForge</a><br>
       <a href="html/index.html" target="_top" rel="me">Documentation</a><br>
diff --git a/ports/ARM7-AT91SAM7X/crt0.s b/ports/ARM7-AT91SAM7X/crt0.s
index 2afc9ef21..73f84319c 100644
--- a/ports/ARM7-AT91SAM7X/crt0.s
+++ b/ports/ARM7-AT91SAM7X/crt0.s
@@ -39,7 +39,7 @@
  * System entry points.
  */
 _start:
-        b       ResetHandler
+        ldr     pc, _reset
         ldr     pc, _undefined
         ldr     pc, _swi
         ldr     pc, _prefetch
@@ -48,6 +48,8 @@ _start:
         ldr     pc, [pc,#-0xF20]        /* AIC - AIC_IVR */
         ldr     pc, [pc,#-0xF20]        /* AIC - AIC_FVR */
 
+_reset:
+        .word   ResetHandler
 _undefined:
         .word   UndHandler
 _swi:
@@ -60,7 +62,6 @@ _fiq:
         .word   FiqHandler
         .word   0
         .word   0
-        .word   0
 
 /*
  * Reset handler.
diff --git a/ports/ARM7-LPC214x/crt0.s b/ports/ARM7-LPC214x/crt0.s
index 3f288b256..3aea74abf 100644
--- a/ports/ARM7-LPC214x/crt0.s
+++ b/ports/ARM7-LPC214x/crt0.s
@@ -39,7 +39,7 @@
  * System entry points.
  */
 _start:
-        b       ResetHandler
+        ldr     pc, _reset
         ldr     pc, _undefined
         ldr     pc, _swi
         ldr     pc, _prefetch
@@ -48,6 +48,8 @@ _start:
         ldr     pc, [pc,#-0xFF0]        /* VIC - IRQ Vector Register */
         ldr     pc, _fiq
 
+_reset:
+        .word   ResetHandler
 _undefined:
         .word   UndHandler
 _swi:
@@ -60,7 +62,6 @@ _fiq:
         .word   FiqHandler
         .word   0
         .word   0
-        .word   0
 
 /*
  * Reset handler.
diff --git a/ports/ARMCM3/crt0.s b/ports/ARMCM3/crt0.s
index 2f2ef7eea..47a89c632 100644
--- a/ports/ARMCM3/crt0.s
+++ b/ports/ARMCM3/crt0.s
@@ -77,8 +77,8 @@ bloop:
         movs    r0, #CONTROL_MODE_PRIVILEGED | CONTROL_USE_PSP
         msr     CONTROL, r0
         isb
-	movs    r0, #0x10
-	msr	BASEPRI, r0
+        movs    r0, #0x10
+        msr     BASEPRI, r0
         cpsie   i
         /*
          * Application-provided HW initialization routine.
diff --git a/readme.txt b/readme.txt
index 9a4b9a4c8..3a5de0cc0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -66,8 +66,8 @@ Win32-MinGW            - ChibiOS/RT simulator and demo into a WIN32 process,
 *****************************************************************************
 
 *** 0.6.5 ***
-- Modified the AT91SAM7X256 demo load script in order to make code segments
-  to start at address 0 instead of 0x100000.
+- FIX: Small fix to the ARM7 startup files. It used a short jump in the reset
+  vector and that could fail in some configurations.
 
 *** 0.6.4 ***
 - NEW: MSP430 port, the port code compiles correctly but it is not tested yet.
-- 
cgit v1.2.3