X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Faltos-loader.ld;h=2be964f2a7bad6bc5598ac9a249085273ace66c5;hp=14b45351d3ce8876fa2c96562df417af5cd8ed53;hb=4a90eec4b8ee4a35711aa74c13b3f30d12c0fe08;hpb=7d98fc5d3f106f3063608a2e5c69d9359061437a

diff --git a/src/stm/altos-loader.ld b/src/stm/altos-loader.ld
index 14b45351..2be964f2 100644
--- a/src/stm/altos-loader.ld
+++ b/src/stm/altos-loader.ld
@@ -16,7 +16,7 @@
  */
 
 MEMORY {
-	rom : ORIGIN = 0x08000000, LENGTH = 8K
+	rom : ORIGIN = 0x08000000, LENGTH = 4K
 	ram : ORIGIN = 0x20000000, LENGTH = 16K
 }
 
@@ -35,27 +35,13 @@ 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 */
-
-	} > rom
-
-	.ARM.exidx : {
 		*(.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,26 +50,33 @@ SECTIONS {
 	.boot (NOLOAD) : {
 		__boot_start__ = .;
 		*(.boot)
-		. = ALIGN(4);
 		__boot_end__ = .;
 	} >ram
 
-	/* Functions placed in RAM (required for flashing) */
-	.textram : {
-		__text_ram_start__ = .;
+	/* 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)
-		. = ALIGN(4);
+		__text_ram_end = .;
 	} >ram AT>rom
-	__text_ram_end = .;
 
 	/* Data -- relocated to RAM, but written to ROM
 	 */
 	.data : {
 		*(.data)	/* initialized data */
-		. = ALIGN (4);
+		__data_end__ = .;
 	} >ram AT>rom
-	__data_end__ = .;
+
 
 	.bss : {
 		__bss_start__ = .;