Maple LD is not flexible

MarlinFirmware · Aug 4, 2021 · 25af85c · 25af85c
1 parent dd9502f
commit 25af85c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_256K.ld b/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_256K.ld
@@ -0,0 +1,14 @@
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K - 40
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 256K - 20K - 4K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc
diff --git a/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_512K.ld b/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_512K.ld
@@ -0,0 +1,14 @@
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K - 40
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 512K - 20K - 4K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc
diff --git a/buildroot/share/PlatformIO/ldscripts/custom.ld b/buildroot/share/PlatformIO/ldscripts/custom.ld
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
@@ -369,7 +369,6 @@ build_flags       = ${common_stm32f1.build_flags}
 platform                  = ${common_stm32f1.platform}
 extends                   = common_stm32f1
 platform_packages         = tool-stm32duino
-board_build.ldscript      = custom.ld
 board_build.address       = 0x08005000
 board_build.offset        = 0x5000
 board_upload.maximum_size = 237568
@@ -385,14 +384,17 @@ lib_ignore                = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED
 platform             = ${ZONESTAR_ZM3E_maple.platform}
 extends              = ZONESTAR_ZM3E_maple
 board                = genericSTM32F103RC
+board_build.ldscript = ZONESTAR_ZM3E_256K.ld
 
 [env:STM32F103VC_ZM3E4_USB_maple]
 platform             = ${ZONESTAR_ZM3E_maple.platform}
 extends              = ZONESTAR_ZM3E_maple
 board                = genericSTM32F103VC
+board_build.ldscript = ZONESTAR_ZM3E_256K.ld
 
 [env:STM32F103VE_ZM3E4V2_USB_maple]
 platform             = ${ZONESTAR_ZM3E_maple.platform}
 extends              = ZONESTAR_ZM3E_maple
 board                = genericSTM32F103VE
+board_build.ldscript = ZONESTAR_ZM3E_512K.ld
 board_upload.maximum_size = 499712