altos: Remove 8051 address space specifiers

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

diff --git a/src/stm/altos-loader.ld b/src/stm/altos-loader.ld
index 2be964f2a7bad6bc5598ac9a249085273ace66c5..1ebbc7a2afcb15b30d2c24fe692547edec4e1073 100644 (file)
--- a/src/stm/altos-loader.ld
+++ b/src/stm/altos-loader.ld
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37,11 +38,11 @@ SECTIONS {
 
                ao_romconfig.o(.romconfig*)
                ao_product.o(.romconfig*)
-               *(.text)        /* Executable code */
+               *(.text*)       /* Executable code */
                *(.ARM.exidx* .gnu.linkonce.armexidx.*)
                *(.rodata*)     /* Constants */
-               __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.
@@ -64,17 +65,18 @@ SECTIONS {
         */
 
        .textram BLOCK(8): {
-               __data_start__ = .;
+               _start__ = .;
                __text_ram_start__ = .;
-               *(.text.ram)
+               *(.ramtext)
                __text_ram_end = .;
        } >ram AT>rom
 
        /* Data -- relocated to RAM, but written to ROM
+        * Also aligned to 8 bytes to agree with textram
         */
-       .data : {
+       .data BLOCK(8): {
                *(.data)        /* initialized data */
-               __data_end__ = .;
+               _end__ = .;
        } >ram AT>rom