merged trunk changes into branch

[proxmark3-svn] / bootrom / ram-reset.s

diff --git a/bootrom/ram-reset.s b/bootrom/ram-reset.s
index 56bf36e3834fe88fd99e02b94feb3e286da89788..ade70d8cc3b2350cccb22fa66cd6ba8ea82cecff 100644 (file)
--- a/bootrom/ram-reset.s
+++ b/bootrom/ram-reset.s
@@ -1,10 +1,20 @@
-.extern BootROM\r
-    \r
-.text\r
-.code 32\r
-.align 0\r
-\r
-.global start\r
-start:\r
-    ldr     sp,     = 0x0020FFF8\r
-    bl      BootROM\r
+@-----------------------------------------------------------------------------
+@ This code is licensed to you under the terms of the GNU GPL, version 2 or,
+@ at your option, any later version. See the LICENSE.txt file for the text of
+@ the license.
+@-----------------------------------------------------------------------------
+@ RAM reset vector for relaunching the bootloader
+@-----------------------------------------------------------------------------
+
+.extern BootROM
+
+.section .startphase2,"ax"
+
+.arm
+
+.global ram_start
+ram_start:
+       ldr     sp,     =_stack_end
+       bl      BootROM
+
+       .ltorg