altos: Add ao_boot_chain to telemega v0.3

[fw/altos] / src / stm / altos-loader.ld

diff --git a/src/stm/altos-loader.ld b/src/stm/altos-loader.ld
index 2d71b4eeeb070511e5a47a01b226f2ed2552687f..5e10e5bade2b4c79f1dc9b404ed800f82e7d57f1 100644 (file)
--- a/src/stm/altos-loader.ld
+++ b/src/stm/altos-loader.ld
@@ -16,8 +16,8 @@
  */
 
 MEMORY {
-       rom (rx) : ORIGIN = 0x08000000, LENGTH = 8K
-       ram (!w) : ORIGIN = 0x20000000, LENGTH = 16K
+       rom : ORIGIN = 0x08000000, LENGTH = 4K
+       ram : ORIGIN = 0x20000000, LENGTH = 16K
 }
 
 INCLUDE registers.ld
@@ -29,35 +29,52 @@ SECTIONS {
         * Rom contents
         */
 
-       .text ORIGIN(rom) : {
+       .text : {
                __text_start__ = .;
                *(.interrupt)   /* Interrupt vectors */
-
-               . = ORIGIN(rom) + 0x100;
-
-               ao_romconfig.o(.romconfig*)
-               ao_product.o(.romconfig*)
-
-               *(.text*)       /* Executable code */
+               *(.romconfig*)
+               *(.text)        /* Executable code */
+               . = ALIGN(4);
                *(.rodata*)     /* Constants */
-
+               . = ALIGN(4);
        } > rom
 
        .ARM.exidx : {
+               . = ALIGN(4);
                *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-               __text_end__ = .;
+               . = ALIGN(4);
        } > rom
+       __text_end__ = .;
 
-       /* Data -- relocated to RAM, but written to ROM
+       /* Boot data which must live at the start of ram so that
+        * the application and bootloader share the same addresses.
+        * This must be all uninitialized data
         */
-       .data ORIGIN(ram) : AT (ADDR(.ARM.exidx) + SIZEOF (.ARM.exidx)) {
+       .boot (NOLOAD) : {
+               __boot_start__ = .;
+               *(.boot)
+               . = ALIGN(4);
+               __boot_end__ = .;
+       } >ram
+
+       /* Functions placed in RAM (required for flashing) */
+       .textram : {
                __data_start__ = .;
+               __text_ram_start__ = .;
+               *(.text.ram)
+               __text_ram_end = .;
+       } >ram AT>rom
+
+       /* Data -- relocated to RAM, but written to ROM
+        */
+       .data : {
                *(.data)        /* initialized data */
                __data_end__ = .;
-               __bss_start__ = .;
-       } >ram
+       } >ram AT>rom
+
 
        .bss : {
+               __bss_start__ = .;
                *(.bss)
                *(COMMON)
                __bss_end__ = .;