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

diff --git a/src/stm/altos-loader.ld b/src/stm/altos-loader.ld
index 2e36dce9..5e10e5ba 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
 }
 
@@ -32,19 +32,17 @@ SECTIONS {
 	.text : {
 		__text_start__ = .;
 		*(.interrupt)	/* Interrupt vectors */
-
-		. = ORIGIN(rom) + 0x100;
-
-		ao_romconfig.o(.romconfig*)
-		ao_product.o(.romconfig*)
-
+		*(.romconfig*)
 		*(.text)	/* Executable code */
-		*(.rodata)	/* Constants */
-
+		. = ALIGN(4);
+		*(.rodata*)	/* Constants */
+		. = ALIGN(4);
 	} > rom
 
 	.ARM.exidx : {
+		. = ALIGN(4);
 		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+		. = ALIGN(4);
 	} > rom
 	__text_end__ = .;
 
@@ -52,7 +50,7 @@ SECTIONS {
 	 * the application and bootloader share the same addresses.
 	 * This must be all uninitialized data
 	 */
-	.boot : {
+	.boot (NOLOAD) : {
 		__boot_start__ = .;
 		*(.boot)
 		. = ALIGN(4);
@@ -61,20 +59,19 @@ SECTIONS {
 
 	/* Functions placed in RAM (required for flashing) */
 	.textram : {
-		__text_ram_start__ = .;
 		__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__ = .;