Clean up line endings, switch everything to LF instead of CRLF

[proxmark3-svn] / bootrom / ldscript-flash

diff --git a/bootrom/ldscript-flash b/bootrom/ldscript-flash
index 50218d684e5cefe5e12130cecd0863032e50bb69..0c637113572ea2e6a0d2bc54b1e64b036c37f6f1 100644 (file)
--- a/bootrom/ldscript-flash
+++ b/bootrom/ldscript-flash
@@ -1,32 +1,53 @@
-INCLUDE ../common/ldscript.common\r
-\r
-ENTRY(flashstart)\r
-SECTIONS\r
-{\r
-    . = 0;\r
-    \r
-    bootphase1 : {\r
-       *(.startup) \r
-       *(.bootphase1)\r
-    } >bootphase1\r
-    \r
-    bootphase2 : {\r
-       __bootphase2_start__ = .;\r
-       *(.startphase2)\r
-       *(.text)\r
-       *(.glue_7)\r
-       *(.glue_7t)\r
-       *(.rodata)\r
-        *(.data)\r
-       . = ALIGN( 32 / 8 );\r
-       __bootphase2_end__ = .;\r
-    } >ram AT>bootphase2\r
-    \r
-    .bss : {\r
-       __bss_start__ = .; \r
-       *(.bss)\r
-    } >ram\r
-    \r
-    . = ALIGN( 32 / 8 );\r
-    __bss_end__ = .;\r
-}\r
+INCLUDE ../common/ldscript.common
+
+ENTRY(flashstart)
+SECTIONS
+{
+    . = 0;
+    
+    .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 = ABSOLUTE(.);
+       *(.version_information);
+       
+       /* 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_src_start__ = ORIGIN(bootphase2);
+    .bootphase2 : {
+       __bootphase2_start__ = .;
+       *(.startphase2)
+       *(.text)
+       *(.eh_frame)
+       *(.glue_7)
+       *(.glue_7t)
+       *(.rodata)
+        *(.data)
+       . = ALIGN( 32 / 8 );
+       __bootphase2_end__ = .;
+    } >ram AT>bootphase2
+    
+    .bss : {
+       __bss_start__ = .; 
+       *(.bss)
+    } >ram
+    
+    . = ALIGN( 32 / 8 );
+    __bss_end__ = .;
+    
+    .commonarea (NOLOAD) : {
+       *(.commonarea)
+    } >commonarea
+}