Refactor linker scripts

saursin · Mar 10, 2024 · adea8a6 · adea8a6
1 parent a3f8e88
commit adea8a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/sw/lib/link/link_bootloader.ld b/sw/lib/link/link_bootloader.ld
@@ -13,15 +13,13 @@ ENTRY(_start)
 MEMORY
 {
     BOOT_ROM (rx):  ORIGIN = 0x00010000, LENGTH = 8K
-
-    CODE_RAM (rx):  ORIGIN = 0x20000000, LENGTH = 40K
-    DATA_RAM (rwx): ORIGIN = 0x2000a000, LENGTH = 8K
+    RAM (rx):       ORIGIN = 0x20000000, LENGTH = 48K
 }
 
 __bootrom_start = ORIGIN(BOOT_ROM);
 __bootrom_size  = LENGTH(BOOT_ROM);
-__approm_start  = ORIGIN(CODE_RAM);
-__approm_size   = LENGTH(CODE_RAM);
+__approm_start  = ORIGIN(RAM);
+__approm_size   = LENGTH(RAM);
 
 
 SECTIONS
@@ -70,7 +68,7 @@ SECTIONS
         . = ALIGN(4);
         _edata = .;
 
-    } > DATA_RAM AT> BOOT_ROM
+    } > RAM AT> BOOT_ROM
 
 
     /* ----- Uninitialized Data ----- */
@@ -86,10 +84,10 @@ SECTIONS
         . = ALIGN(4);
         _ebss = .;
 
-    } > DATA_RAM AT> BOOT_ROM
+    } > RAM AT> BOOT_ROM
 
     _end = .;
 }
 
 PROVIDE(_start_heap = _ebss);
-PROVIDE(_stack_pointer  = ORIGIN(DATA_RAM) + LENGTH(DATA_RAM));
+PROVIDE(_stack_pointer  = ORIGIN(RAM) + LENGTH(RAM));
diff --git a/sw/lib/link/link_hydrogensoc.ld b/sw/lib/link/link_hydrogensoc.ld
@@ -12,8 +12,8 @@ ENTRY(_start)
 /* MEMORY LAYOUT */
 MEMORY
 {
-    CODE_RAM (rx):  ORIGIN = 0x20000000, LENGTH = 40K
-    DATA_RAM (rwx): ORIGIN = 0x2000a000, LENGTH = 8K
+    CODE_RAM (rx):  ORIGIN = 0x20000000,                            LENGTH = 36K
+    DATA_RAM (rwx): ORIGIN = (ORIGIN(CODE_RAM) + LENGTH(CODE_RAM)), LENGTH = 12K
 }
 
 __coderam_start = ORIGIN(CODE_RAM);