altos/stm: Provide another 4kB of flash space for apps

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

diff --git a/src/stm/altos-application.ld b/src/stm/altos-application.ld
index 63a3be0002345662eb4f5acf906491890ed0c835..6affc376a1e75e19887191894728101f51dc8e73 100644 (file)
--- a/src/stm/altos-application.ld
+++ b/src/stm/altos-application.ld
@@ -16,7 +16,7 @@
  */
 
 MEMORY {
-       rom (rx) : ORIGIN = 0x08002000, LENGTH = 120K
+       rom (rx) : ORIGIN = 0x08001000, LENGTH = 124K
        ram (!w) : ORIGIN = 0x20000000, LENGTH = 16K
 }
 
@@ -35,9 +35,19 @@ SECTIONS {
 
                . = ORIGIN(rom) + 0x100;
 
+
+               /* Ick. What I want is to specify the
+                * addresses of some global constants so
+                * that I can find them across versions
+                * of the application. I can't figure out
+                * how to make gnu ld do that, so instead
+                * we just load the two files that include
+                * these defines in the right order here and
+                * expect things to 'just work'. Don't change
+                * the contents of those files, ok?
+                */
                ao_romconfig.o(.romconfig*)
                ao_product.o(.romconfig*)
-
                *(.text*)       /* Executable code */
                *(.rodata*)     /* Constants */
 
@@ -45,21 +55,34 @@ SECTIONS {
 
        .ARM.exidx : {
                *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-               __text_end__ = .;
        } > rom
+       __text_end__ = .;
+
+       /* 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
+        */
+       .boot (NOLOAD) : {
+               __boot_start__ = .;
+               *(.boot)
+               . = ALIGN(4);
+               __boot_end__ = .;
+       } >ram
 
        /* Data -- relocated to RAM, but written to ROM
         */
-       .data ORIGIN(ram) : AT (ADDR(.ARM.exidx) + SIZEOF (.ARM.exidx)) {
+       .data : {
                __data_start__ = .;
                *(.data)        /* initialized data */
+               . = ALIGN(4);
                __data_end__ = .;
-               __bss_start__ = .;
-       } >ram
+       } >ram AT>rom
 
        .bss : {
+               __bss_start__ = .;
                *(.bss)
                *(COMMON)
+               . = ALIGN(4);
                __bss_end__ = .;
        } >ram