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

diff --git a/src/stm/altos-loader.ld b/src/stm/altos-loader.ld
index 14b45351..5ef09cd2 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
@@ -15,87 +16,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-MEMORY {
-	rom : ORIGIN = 0x08000000, LENGTH = 8K
-	ram : ORIGIN = 0x20000000, LENGTH = 16K
-}
+__flash = 0x08000000;
+__flash_size = 4K;
+__ram =   0x20000000;
+__ram_size = 16K;
+__stack_size = 512;
 
 INCLUDE registers.ld
-
-EXTERN (stm_interrupt_vector)
-
-SECTIONS {
-	/*
-	 * Rom contents
-	 */
-
-	.text : {
-		__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
-
-	/* Functions placed in RAM (required for flashing) */
-	.textram : {
-		__text_ram_start__ = .;
-		__data_start__ = .;
-		*(.text.ram)
-		. = ALIGN(4);
-	} >ram AT>rom
-	__text_ram_end = .;
-
-	/* Data -- relocated to RAM, but written to ROM
-	 */
-	.data : {
-		*(.data)	/* initialized data */
-		. = ALIGN (4);
-	} >ram AT>rom
-	__data_end__ = .;
-
-	.bss : {
-		__bss_start__ = .;
-		*(.bss)
-		*(COMMON)
-		__bss_end__ = .;
-	} >ram
-
-	PROVIDE(__stack__ = ORIGIN(ram) + LENGTH(ram));
-	PROVIDE(end = .);
-}
-
-ENTRY(start);
-
-
+INCLUDE picolibc.ld