Eradicate all occurences of hardcoded memory addresses from all sources files, except...

[proxmark3-svn] / bootrom / bootrom.c

diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 3dba041e67757d79396b5cd1f595448dc9fe622c..2d94f01ae4559d6c56ca7cf8f9bb7ae0716bed4f 100644 (file)
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -107,6 +107,7 @@ void UsbPacketReceived(BYTE *packet, int len)
     UsbSendPacket(packet, len);\r
 }\r
 \r
+extern char _osimage_entry;\r
 void BootROM(void)\r
 {\r
     //------------\r
@@ -182,9 +183,8 @@ void BootROM(void)
             USB_D_PLUS_PULLUP_OFF();\r
             LED_B_ON();\r
 \r
-                       // jump to Flash address 0x10000 (LSBit set for thumb mode, 0x100000 added for Flash base address)\r
-            asm("ldr r3, = 0x00110001\n");\r
-            asm("bx r3\n");\r
+                       // jump to Flash address of the osimage entry point (LSBit set for thumb mode)\r
+            asm("bx %0\n" : : "r" ( ((int)&_osimage_entry) | 0x1 ) );\r
         }\r
     }\r
 }\r