fastflash: Compatible with GCC 4.9.3

7 years ago · 899852423d
parent d80979cd0a
commit 899852423d
2 changed files with 3 additions and 3 deletions
--- a/memory_app_2.0.0.ld
+++ b/memory_app_2.0.0.ld
@ -3,8 +3,8 @@
 MEMORY
 {
 	rom (rx)        : ORIGIN = 0x08010000, LENGTH = 512K - 64K
-	bootloader (rx) : ORIGIN = 0x20000000, LENGTH = __bootloader_size__
-	ram (rwx)       : ORIGIN = ORIGIN(bootloader) + LENGTH(bootloader),
+	bootloader (rx) : ORIGIN = 0x20000000, LENGTH = 20K
+	ram (rwx)       : ORIGIN = 0x20000000 + LENGTH(bootloader),
 			  LENGTH = 128K - LENGTH(bootloader)
 }

--- a/memory_app_fastflash.ld
+++ b/memory_app_fastflash.ld
@ -2,7 +2,7 @@
 MEMORY
 {
 	rom (rx)  : ORIGIN = 0x20000000, LENGTH = 20K
-	ram (rwx) : ORIGIN = ORIGIN(rom) + LENGTH(rom),
+	ram (rwx) : ORIGIN = 0x20000000 + LENGTH(rom),
 		    LENGTH = 128K - LENGTH(rom)
 }