X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/fb6e5aa8630a2d181bcc82d7a3b2b3108d57937f..8a6aec16d8c21d3c57457e5ec00eb83f5242feba:/bootrom/ldscript-flash

diff --git a/bootrom/ldscript-flash b/bootrom/ldscript-flash
index 55078012..d2e6648b 100644
--- a/bootrom/ldscript-flash
+++ b/bootrom/ldscript-flash
@@ -1,18 +1,6 @@
-MEMORY 
-{
-	/* AT91SAM7S256 has 256k Flash and 64k RAM */
-	/* Important note: the correct ORIGIN for bootphase1 is 0x00100000 and for bootphase2 is 0x00100200
-	   However, this will confuse the currently deployed flash code which expects logical and and not
-	   physical addresses and performs no sanity checks at all. If confronted with physical addresses, 
-	   it will happily erase everything and brick the device. So for the time being pretend these addresses
-	   to start at 0x0 while updating all the flash code with proper sanity checks, then come back later and
-	   fix the addresses. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27 */
-        bootphase1 : ORIGIN = 0x00000000, LENGTH = 0x200 /* Phase 1 bootloader: Copies real bootloader to RAM */
-        bootphase2 : ORIGIN = 0x00000200, LENGTH = 0x2000 - 0x200 /* Main bootloader code, stored in Flash, executed from RAM */
-        ram     : ORIGIN = 0x00200000, LENGTH = 64K
-}
-
+INCLUDE ../common/ldscript.common
 
+ENTRY(flashstart)
 SECTIONS
 {
     . = 0;
@@ -20,6 +8,18 @@ SECTIONS
     bootphase1 : {
     	*(.startup) 
     	*(.bootphase1)
+    	
+    	/* It seems to be impossible to flush align a section at the
+    	   end of a memory segment. Instead, we'll put the version_information
+    	   wherever the linker wants it, and then put a pointer to the start
+    	   of the version information at the end of the section.
+    	   -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-28 */
+    	   
+    	_version_information_start = .;
+    	*(.version_information);
+    	
+    	. = LENGTH(bootphase1) - 0x4; /* Skip ahead to the end */
+    	LONG(_version_information_start)
     } >bootphase1
     
     bootphase2 : {