X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8a6aec16d8c21d3c57457e5ec00eb83f5242feba..59936251ffa2fef71f48aa517ba8b3296a66dc18:/bootrom/ldscript-flash?ds=sidebyside

diff --git a/bootrom/ldscript-flash b/bootrom/ldscript-flash
index d2e6648b..ccc0db2f 100644
--- a/bootrom/ldscript-flash
+++ b/bootrom/ldscript-flash
@@ -5,7 +5,7 @@ SECTIONS
 {
     . = 0;
     
-    bootphase1 : {
+    .bootphase1 : {
     	*(.startup) 
     	*(.bootphase1)
     	
@@ -15,17 +15,22 @@ SECTIONS
     	   of the version information at the end of the section.
     	   -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-28 */
     	   
-    	_version_information_start = .;
+    	_version_information_start = ABSOLUTE(.);
     	*(.version_information);
     	
-    	. = LENGTH(bootphase1) - 0x4; /* Skip ahead to the end */
+	/* Why doesn't this work even though _bootphase1_version_pointer = 0x1001fc?
+	  . = _bootphase1_version_pointer - ORIGIN(bootphase1); */
+	/* This works, apparently it fools the linker into accepting an absolute address */
+	. = _bootphase1_version_pointer - ORIGIN(bootphase1) + ORIGIN(bootphase1);
     	LONG(_version_information_start)
     } >bootphase1
     
-    bootphase2 : {
+    __bootphase2_src_start__ = ORIGIN(bootphase2);
+    .bootphase2 : {
     	__bootphase2_start__ = .;
     	*(.startphase2)
     	*(.text)
+    	*(.eh_frame)
     	*(.glue_7)
     	*(.glue_7t)
     	*(.rodata)
@@ -41,4 +46,8 @@ SECTIONS
     
     . = ALIGN( 32 / 8 );
     __bss_end__ = .;
+    
+    .commonarea (NOLOAD) : {
+    	*(.commonarea)
+    } >commonarea
 }