X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Faltos-loader.ld;h=a4a7dc43fe60c05381d2ff87b9ddd4e7628a0858;hp=5e10e5bade2b4c79f1dc9b404ed800f82e7d57f1;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=a2e0676f476b0e2bdd5102315ebd5904b57f384a

diff --git a/src/stm/altos-loader.ld b/src/stm/altos-loader.ld
index 5e10e5ba..a4a7dc43 100644
--- 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
@@ -32,17 +33,14 @@ SECTIONS {
 	.text : {
 		__text_start__ = .;
 		*(.interrupt)	/* Interrupt vectors */
-		*(.romconfig*)
-		*(.text)	/* Executable code */
-		. = ALIGN(4);
-		*(.rodata*)	/* Constants */
-		. = ALIGN(4);
-	} > rom
 
-	.ARM.exidx : {
-		. = ALIGN(4);
+		. = ORIGIN(rom) + 0x100;
+
+		ao_romconfig.o(.romconfig*)
+		ao_product.o(.romconfig*)
+		*(.text*)	/* Executable code */
 		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
-		. = ALIGN(4);
+		*(.rodata*)	/* Constants */
 	} > rom
 	__text_end__ = .;
 
@@ -53,15 +51,23 @@ SECTIONS {
 	.boot (NOLOAD) : {
 		__boot_start__ = .;
 		*(.boot)
-		. = ALIGN(4);
 		__boot_end__ = .;
 	} >ram
 
-	/* Functions placed in RAM (required for flashing) */
-	.textram : {
+	/* Functions placed in RAM (required for flashing)
+	 *
+	 * Align to 8 bytes as that's what the ARM likes text
+	 * segment alignments to be, and if we don't, then
+	 * we end up with a mismatch between the location in
+	 * ROM and the desired location in RAM. I don't
+	 * entirely understand this, but at least this appears
+	 * to work...
+	 */
+
+	.textram BLOCK(8): {
 		__data_start__ = .;
 		__text_ram_start__ = .;
-		*(.text.ram)
+		*(.ramtext)
 		__text_ram_end = .;
 	} >ram AT>rom