1 files changed, 40 insertions, 14 deletions

diff --git a/firmware/target/arm/s5l8700/boot.lds b/firmware/target/arm/s5l8700/boot.lds
index 8ce942c9b2..2d2a686f9d 100644
--- a/firmware/target/arm/s5l8700/boot.lds
+++ b/firmware/target/arm/s5l8700/boot.lds
@@ -1,12 +1,12 @@
 #include "config.h"
 
-ENTRY(start)
+ENTRY(_start)
 OUTPUT_FORMAT(elf32-bigarm)
 OUTPUT_ARCH(arm)
-STARTUP(target/arm/crt0.o)
+STARTUP(target/arm/s5l8700/crt0.o)
 
 /* DRAMORIG is in fact 0x8000000 but remapped to 0x0 */
-#define DRAMORIG 0x0
+#define DRAMORIG 0x8000000
 #define DRAMSIZE 16M
 
 #define IRAMORIG 0x22000000
@@ -22,41 +22,67 @@ STARTUP(target/arm/crt0.o)
 #define FLASHORIG 0x24000000
 #define FLASHSIZE 1M
 
+MEMORY
+{
+    DRAM  : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
+    IRAM  : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
+    FLASH : ORIGIN = FLASHORIG, LENGTH = FLASHSIZE
+}
+        
+
 SECTIONS
 {
-  /*. = IRAMORIG; */
-  /* As long as we don't flash the code, use the DFU load address */
-  . = DFULOADADDR;
+  .intvect : {
+    _intvectstart = . ;
+    *(.intvect)
+    _intvectend = _newstart ;  
+  } >IRAM AT> FLASH
+  _intvectcopy = LOADADDR(.intvect) ;
 
   .text : {
     *(.init.text)
     *(.text*)
-  }
+    *(.glue_7*)
+  } > FLASH
+
+  .rodata : {
+    *(.rodata*)
+    . = ALIGN(0x4);
+  } > FLASH
 
   .data : {
-    *(.icode)
+    _datastart = . ;
     *(.irodata)
+    *(.icode)
     *(.idata)
     *(.data*)
     *(.ncdata*);
+    . = ALIGN(0x4);
     _dataend = . ;
-   }
+   } > IRAM AT> FLASH
+   _datacopy = LOADADDR(.data) ;
 
   .stack :
   {
      *(.stack)
      _stackbegin = .;
-     stackbegin = .;
-     . += 0x1000;
+     . += 0x2000;
      _stackend = .;
-     stackend = .;
-  }
+     _irqstackbegin = .;
+     . += 0x400;
+     _irqstackend = .;
+     _fiqstackbegin = .;
+     . += 0x400;
+     _fiqstackend = .;
+  } > IRAM
 
   .bss : {
      _edata = .;
      *(.bss*);
      *(.ibss);
      *(.ncbss*);
+     *(COMMON);
+    . = ALIGN(0x4);
      _end = .;
-   }
+   } > IRAM
 }