X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Faltos-loader.ld;h=78649be2ca6557b8c4de4afc63b7e676d5a82e2e;hb=dfc268e0021e1cd3045f73339a749d292a6a6300;hp=50a425c75309f2cf203bf25d200f50e2706cbcfe;hpb=56a7cbbf51f5c9ebbfe17d1cc30ed807572af3cc;p=fw%2Faltos

diff --git a/src/stm/altos-loader.ld b/src/stm/altos-loader.ld
index 50a425c7..78649be2 100644
--- a/src/stm/altos-loader.ld
+++ b/src/stm/altos-loader.ld
@@ -32,12 +32,7 @@ SECTIONS {
 	.text : {
 		__text_start__ = .;
 		*(.interrupt)	/* Interrupt vectors */
-
-		. = ORIGIN(rom) + 0x100;
-
-		ao_romconfig.o(.romconfig*)
-		ao_product.o(.romconfig*)
-
+		*(.romconfig)
 		*(.text)	/* Executable code */
 		*(.rodata)	/* Constants */
 
@@ -48,9 +43,20 @@ SECTIONS {
 	} > 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
+
 	/* Functions placed in RAM (required for flashing) */
 	.textram : {
-		__text_ram_start = .;
+		__text_ram_start__ = .;
 		__data_start__ = .;
 		*(.text.ram)
 		. = ALIGN(4);