fixed and clarified FILE_NAME offset in ldscripts

tridge · AlkaMotors · commit 2495380d19a4 · 2025-03-28T10:51:04.000-03:00
the main bug was in f031 which had this:

  FILE_NAME     (rx)  : ORIGIN = 0x08007C00 - 32, LENGTH = 32
  EEPROM        (rx)  : ORIGIN = 0x080007C00, LENGTH = 1K

there is one too many zeros in the EEPROM origin
diff --git a/Mcu/e230/GD32E230K8_FLASH.ld b/Mcu/e230/GD32E230K8_FLASH.ld
@@ -12,8 +12,8 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
 FLASH (rx)      : ORIGIN = 0x08001000, LENGTH = 27K
-FILE_NAME     (rx)  : ORIGIN = 0x08007C00 - 32, LENGTH = 32
 EEPROM        (rx)  : ORIGIN = 0x08007C00, LENGTH = 1K
+FILE_NAME     (rx)  : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32
 RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 16K
 
 }
diff --git a/Mcu/f031/STM32F031C6TX_FLASH.ld b/Mcu/f031/STM32F031C6TX_FLASH.ld
@@ -40,9 +40,9 @@ MEMORY
   RAM           (xrw) : ORIGIN = 0x200000C0, LENGTH = 4K - 192
   FLASH_VECTAB  (rx)  : ORIGIN = 0x08001000, LENGTH = 192
   FLASH         (rx)  : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 27K - 32 - LENGTH(FLASH_VECTAB)
-  FILE_NAME     (rx)  : ORIGIN = 0x08007C00 - 32, LENGTH = 32
-  EEPROM        (rx)  : ORIGIN = 0x080007C00, LENGTH = 1K
- 
+  EEPROM        (rx)  : ORIGIN = 0x08007C00, LENGTH = 1K
+  FILE_NAME     (rx)  : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32
+
 }
 
 /* Sections */
diff --git a/Mcu/f051/STM32F051K6TX_FLASH.ld b/Mcu/f051/STM32F051K6TX_FLASH.ld
@@ -41,8 +41,8 @@ MEMORY
   RAM           (xrw) : ORIGIN = 0x200000C0, LENGTH = 8K - 192
   FLASH_VECTAB  (rx)  : ORIGIN = 0x08001000, LENGTH = 192
   FLASH         (rx)  : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 27K - 32 - LENGTH(FLASH_VECTAB)
-  FILE_NAME     (rx)  : ORIGIN = 0x08007C00 - 32, LENGTH = 32
   EEPROM        (rx)  : ORIGIN = 0x08007C00, LENGTH = 1K
+  FILE_NAME     (rx)  : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32
 }
 
 /* Sections */
diff --git a/Mcu/f421/AT32F421x6_FLASH.ld b/Mcu/f421/AT32F421x6_FLASH.ld
@@ -39,8 +39,8 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
 FLASH (rx)      : ORIGIN = 0x08001000, LENGTH = 27K
-FILE_NAME     (rx)  : ORIGIN = 0x08007C00 - 32, LENGTH = 32
 EEPROM        (rx)  : ORIGIN = 0x08007C00, LENGTH = 1K
+FILE_NAME     (rx)  : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32
 RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 15K
 
 }
diff --git a/Mcu/g031/STM32G031GBUX_FLASH.ld b/Mcu/g031/STM32G031GBUX_FLASH.ld
@@ -42,8 +42,8 @@ MEMORY
   RAM          (xrw) : ORIGIN = 0x20000000, LENGTH = 8K
   FLASH_VECTAB  (rx)  : ORIGIN = 0x08001000, LENGTH = 192
   FLASH         (rx)  : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 62K - 32 - LENGTH(FLASH_VECTAB)
-  FILE_NAME     (rx)  : ORIGIN = 0x0800F800 - 32, LENGTH = 32
   EEPROM        (rx)  : ORIGIN = 0x0800F800, LENGTH = 2K
+  FILE_NAME     (rx)  : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32
 }
 
 /* Sections */
diff --git a/Mcu/g071/STM32G071GBUX_FLASH.ld b/Mcu/g071/STM32G071GBUX_FLASH.ld
@@ -42,8 +42,8 @@ MEMORY
   RAM          (xrw) : ORIGIN = 0x20000000, LENGTH = 36K
   FLASH_VECTAB  (rx)  : ORIGIN = 0x08001000, LENGTH = 192
   FLASH         (rx)  : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 62K - 32 - LENGTH(FLASH_VECTAB)
-  FILE_NAME     (rx)  : ORIGIN = 0x0800F800 - 32, LENGTH = 32
   EEPROM        (rx)  : ORIGIN = 0x0800F800, LENGTH = 2K
+  FILE_NAME     (rx)  : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32
 }
 
 /* Sections */
diff --git a/Mcu/g431/STM32G431_FLASH.ld b/Mcu/g431/STM32G431_FLASH.ld
@@ -16,8 +16,8 @@ MEMORY
   RAM          (xrw) : ORIGIN = 0x20000000, LENGTH = 32K
   FLASH_VECTAB  (rx)  : ORIGIN = 0x08001000, LENGTH = 512
   FLASH         (rx)  : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 62K - 32 - LENGTH(FLASH_VECTAB)
-  FILE_NAME     (rx)  : ORIGIN = 0x0800F800 - 32, LENGTH = 32
   EEPROM        (rx)  : ORIGIN = 0x0800F800, LENGTH = 2K
+  FILE_NAME     (rx)  : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32
 }
 
 /* Sections */
diff --git a/Mcu/v203/Link.ld b/Mcu/v203/Link.ld
@@ -20,6 +20,7 @@ MEMORY
         RESET_FLASH(rx)   : ORIGIN = 0x00001000, LENGTH = 192
         FLASH_VERSION(rx) : ORIGIN = 0x000010C0, LENGTH = 16
         FLASH (rx)     : ORIGIN = 0x000010D0, LENGTH = 56K - 0xD0
+        EEPROM        (rx)  : ORIGIN = 0x0000f800, LENGTH = 1K
         FILE_NAME (rx) : ORIGIN = 0x0000f800 - 32, LENGTH = 32
 	RAM (xrw)     : ORIGIN = 0x20000000, LENGTH = 20K
 }

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ _Min_Stack_Size = 0x400; /* required amount of stack */`
`12`	`12`	`MEMORY`
`13`	`13`	`{`
`14`	`14`	`FLASH (rx) : ORIGIN = 0x08001000, LENGTH = 27K`
`15`		`-FILE_NAME (rx) : ORIGIN = 0x08007C00 - 32, LENGTH = 32`
`16`	`15`	`EEPROM (rx) : ORIGIN = 0x08007C00, LENGTH = 1K`
	`16`	`+FILE_NAME (rx) : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32`
`17`	`17`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 16K`
`18`	`18`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ MEMORY`
`41`	`41`	`RAM (xrw) : ORIGIN = 0x200000C0, LENGTH = 8K - 192`
`42`	`42`	`FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 192`
`43`	`43`	`FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 27K - 32 - LENGTH(FLASH_VECTAB)`
`44`		`- FILE_NAME (rx) : ORIGIN = 0x08007C00 - 32, LENGTH = 32`
`45`	`44`	`EEPROM (rx) : ORIGIN = 0x08007C00, LENGTH = 1K`
	`45`	`+ FILE_NAME (rx) : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/* Sections */`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ _Min_Stack_Size = 0x400; /* required amount of stack */`
`39`	`39`	`MEMORY`
`40`	`40`	`{`
`41`	`41`	`FLASH (rx) : ORIGIN = 0x08001000, LENGTH = 27K`
`42`		`-FILE_NAME (rx) : ORIGIN = 0x08007C00 - 32, LENGTH = 32`
`43`	`42`	`EEPROM (rx) : ORIGIN = 0x08007C00, LENGTH = 1K`
	`43`	`+FILE_NAME (rx) : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32`
`44`	`44`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 15K`
`45`	`45`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ MEMORY`
`42`	`42`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 8K`
`43`	`43`	`FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 192`
`44`	`44`	`FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 62K - 32 - LENGTH(FLASH_VECTAB)`
`45`		`- FILE_NAME (rx) : ORIGIN = 0x0800F800 - 32, LENGTH = 32`
`46`	`45`	`EEPROM (rx) : ORIGIN = 0x0800F800, LENGTH = 2K`
	`46`	`+ FILE_NAME (rx) : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/* Sections */`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ MEMORY`
`16`	`16`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K`
`17`	`17`	`FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 512`
`18`	`18`	`FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 62K - 32 - LENGTH(FLASH_VECTAB)`
`19`		`- FILE_NAME (rx) : ORIGIN = 0x0800F800 - 32, LENGTH = 32`
`20`	`19`	`EEPROM (rx) : ORIGIN = 0x0800F800, LENGTH = 2K`
	`20`	`+ FILE_NAME (rx) : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/* Sections */`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ MEMORY`
`20`	`20`	`RESET_FLASH(rx) : ORIGIN = 0x00001000, LENGTH = 192`
`21`	`21`	`FLASH_VERSION(rx) : ORIGIN = 0x000010C0, LENGTH = 16`
`22`	`22`	`FLASH (rx) : ORIGIN = 0x000010D0, LENGTH = 56K - 0xD0`
	`23`	`+ EEPROM (rx) : ORIGIN = 0x0000f800, LENGTH = 1K`
`23`	`24`	`FILE_NAME (rx) : ORIGIN = 0x0000f800 - 32, LENGTH = 32`
`24`	`25`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K`
`25`	`26`	`}`