/client/Makefile: Output object files to the obj subdir.

[proxmark3-svn] / bootrom / fromflash.c

diff --git a/bootrom/fromflash.c b/bootrom/fromflash.c
index e6868092fdc9d4e050cdfaf68af7478b203dd211..81501fd03516f61602c3e57f47fed04534d1ef93 100644 (file)
--- a/bootrom/fromflash.c
+++ b/bootrom/fromflash.c
@@ -1,11 +1,21 @@
-#include <proxmark3.h>\r
-\r
-void CopyBootToRAM(void)\r
-{\r
-       int i;\r
-\r
-       volatile DWORD *s = (volatile DWORD *)0x200;\r
-       volatile DWORD *d = (volatile DWORD *)0x200000;\r
-\r
-       for(i = 0; i < 1024; i++) *d++ = *s++;\r
-}\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.
+//-----------------------------------------------------------------------------
+// Helper function for launching the bootloader from FLASH
+//-----------------------------------------------------------------------------
+
+#include <proxmark3.h>
+
+extern char __bootphase2_src_start__, __bootphase2_start__, __bootphase2_end__;
+void __attribute__((section(".bootphase1"))) CopyBootToRAM(void)
+{
+       int i;
+
+       volatile uint32_t *s = (volatile uint32_t *)&__bootphase2_src_start__;
+       volatile uint32_t *d = (volatile uint32_t *)&__bootphase2_start__;
+       unsigned int l = (int)&__bootphase2_end__ - (int)&__bootphase2_start__;
+
+       for(i = 0; i < l/sizeof(uint32_t); i++) *d++ = *s++;
+}