4 files changed, 39 insertions, 101 deletions
diff --git a/src/stm/altos-application.ld b/src/stm/altos-application.ld
deleted file mode 100644
index 6affc376..00000000
--- a/src/stm/altos-application.ld
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright © 2012 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-MEMORY {
-	rom (rx) : ORIGIN = 0x08001000, LENGTH = 124K
-	ram (!w) : ORIGIN = 0x20000000, LENGTH = 16K
-}
-
-INCLUDE registers.ld
-
-EXTERN (stm_interrupt_vector)
-
-SECTIONS {
-	/*
-	 * Rom contents
-	 */
-
-	.text ORIGIN(rom) : {
-		__text_start__ = .;
-		*(.interrupt)	/* Interrupt vectors */
-
-		. = 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.*)
-	} > 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
-
-	/* Data -- relocated to RAM, but written to ROM
-	 */
-	.data : {
-		__data_start__ = .;
-		*(.data)	/* initialized data */
-		. = ALIGN(4);
-		__data_end__ = .;
-	} >ram AT>rom
-
-	.bss : {
-		__bss_start__ = .;
-		*(.bss)
-		*(COMMON)
-		. = ALIGN(4);
-		__bss_end__ = .;
-	} >ram
-
-	PROVIDE(__stack__ = ORIGIN(ram) + LENGTH(ram));
-	PROVIDE(end = .);
-}
-
-ENTRY(start);
-
-
diff --git a/src/stm/altos.ld b/src/stm/altos.ld
index d218e992..3106cc3b 100644
--- a/src/stm/altos.ld
+++ b/src/stm/altos.ld
@@ -16,7 +16,7 @@
  */
 
 MEMORY {
-	rom (rx) : ORIGIN = 0x08000000, LENGTH = 128K
+	rom (rx) : ORIGIN = 0x08001000, LENGTH = 124K
 	ram (!w) : ORIGIN = 0x20000000, LENGTH = 15872
 	stack (!w) : ORIGIN = 0x20003e00, LENGTH = 512
 }
@@ -36,9 +36,19 @@ 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 */
 
@@ -46,21 +56,34 @@ SECTIONS {
 
 	.ARM.exidx : {
 		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
-		__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.
+	 * This must be all uninitialized data
+	 */
+	.boot (NOLOAD) : {
+		__boot_start__ = .;
+		*(.boot)
+		. = ALIGN(4);
+		__boot_end__ = .;
+	} >ram
 
 	/* Data -- relocated to RAM, but written to ROM
 	 */
-	.data ORIGIN(ram) : AT (ADDR(.ARM.exidx) + SIZEOF (.ARM.exidx)) {
+	.data : {
 		__data_start__ = .;
 		*(.data)	/* initialized data */
+		. = ALIGN(4);
 		__data_end__ = .;
-		__bss_start__ = .;
-	} >ram
+	} >ram AT>rom
 
 	.bss : {
+		__bss_start__ = .;
 		*(.bss)
 		*(COMMON)
+		. = ALIGN(4);
 		__bss_end__ = .;
 	} >ram
 
diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h
index 27a942f2..cc83eac2 100644
--- a/src/stm/ao_arch.h
+++ b/src/stm/ao_arch.h
@@ -129,5 +129,10 @@ extern const uint32_t	ao_radio_cal;
 void
 ao_adc_init();
 
+#define AO_BOOT_APPLICATION_BASE	((uint32_t *) 0x1000)
+#define AO_BOOT_LOADER_BASE		((uint32_t *) 0x0)
+#define HAS_BOOT_LOADER			1
+
 #endif /* _AO_ARCH_H_ */
 
+
diff --git a/src/stm/ao_boot.h b/src/stm/ao_boot.h
index 3e8c50ba..862e8755 100644
--- a/src/stm/ao_boot.h
+++ b/src/stm/ao_boot.h
@@ -30,4 +30,9 @@ ao_boot_check_chain(void);
 void
 ao_boot_reboot(uint32_t *base);
 
+static inline void
+ao_boot_loader(void) {
+	ao_boot_reboot(AO_BOOT_LOADER_BASE);
+}
+
 #endif /* _AO_BOOT_H_ */