Jump to the correct physical address in Flash. (The comment was wrong, it never used...

[proxmark3-svn] / bootrom / ldscript-flash

diff --git a/bootrom/ldscript-flash b/bootrom/ldscript-flash
index fa6fb26e4fec6cc4ce2dfe83a72a0eada3fdd75e..50218d684e5cefe5e12130cecd0863032e50bb69 100644 (file)
--- a/bootrom/ldscript-flash
+++ b/bootrom/ldscript-flash
@@ -1,18 +1,6 @@
-MEMORY \r
-{\r
-       /* AT91SAM7S256 has 256k Flash and 64k RAM */\r
-       /* Important note: the correct ORIGIN for bootphase1 is 0x00100000 and for bootphase2 is 0x00100200\r
-          However, this will confuse the currently deployed flash code which expects logical and and not\r
-          physical addresses and performs no sanity checks at all. If confronted with physical addresses, \r
-          it will happily erase everything and brick the device. So for the time being pretend these addresses\r
-          to start at 0x0 while updating all the flash code with proper sanity checks, then come back later and\r
-          fix the addresses. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27 */\r
-        bootphase1 : ORIGIN = 0x00000000, LENGTH = 0x200 /* Phase 1 bootloader: Copies real bootloader to RAM */\r
-        bootphase2 : ORIGIN = 0x00000200, LENGTH = 0x2000 - 0x200 /* Main bootloader code, stored in Flash, executed from RAM */\r
-        ram     : ORIGIN = 0x00200000, LENGTH = 32K\r
-}\r
-\r
+INCLUDE ../common/ldscript.common\r

 \r
 \r

+ENTRY(flashstart)\r

 SECTIONS\r
 {\r
     . = 0;\r
 SECTIONS\r
 {\r
     . = 0;\r


@@ -27,6 +15,7 @@ SECTIONS
        *(.startphase2)\r
        *(.text)\r
        *(.glue_7)\r
        *(.startphase2)\r
        *(.text)\r
        *(.glue_7)\r

+       *(.glue_7t)\r

        *(.rodata)\r
         *(.data)\r
        . = ALIGN( 32 / 8 );\r
        *(.rodata)\r
         *(.data)\r
        . = ALIGN( 32 / 8 );\r