[Ion/ld] Moved storage and persisting bytes position

numworks · Sep 14, 2021 · 0e1d6f2 · 0e1d6f2
1 parent 4fb36ce
commit 0e1d6f2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/ion/src/device/kernel/shared_kernel_flash.ld b/ion/src/device/kernel/shared_kernel_flash.ld
@@ -1,4 +1,4 @@
-PERSITING_BYTES_ORIGIN = PERSITING_BYTES_VIRTUAL_ORIGIN + EPSILON_SLOT * PERSITING_BYTES_LENGTH;
+PERSITING_BYTES_ORIGIN = PERSITING_BYTES_VIRTUAL_ORIGIN + EPSILON_OFFSET;
 KERNEL_ORIGIN = KERNEL_VIRTUAL_ORIGIN + EPSILON_OFFSET;
 
 MEMORY {

diff --git a/ion/src/device/n0100/shared/config_flash.ld b/ion/src/device/n0100/shared/config_flash.ld
@@ -18,7 +18,11 @@ PERSITING_BYTES_VIRTUAL_ORIGIN = KERNEL_VIRTUAL_ORIGIN + KERNEL_LENGTH;
 PERSITING_BYTES_LENGTH = SMALLEST_FLASH_SECTOR_LENGTH;
 
 USERLAND_VIRTUAL_ORIGIN = PERSITING_BYTES_VIRTUAL_ORIGIN + PERSITING_BYTES_LENGTH;
-USERLAND_AND_EXTERNAL_APPS_LENGTH = FLASH_LENGTH - PERSITING_BYTES_LENGTH - KERNEL_LENGTH;
+USERLAND_LENGTH = FLASH_LENGTH - PERSITING_BYTES_LENGTH - KERNEL_LENGTH;
+
+STORAGE_ORIGIN = FLASH_ORIGIN + FLASH_LENGTH;
+STORAGE_SIZE = 0;
+
 
 SIGNED_PAYLOAD_LENGTH = 0;
 CANARY_LENGTH = 0;

diff --git a/ion/src/device/n0110/shared/config_flash.ld b/ion/src/device/n0110/shared/config_flash.ld
@@ -41,14 +41,20 @@ EXTERNAL_FLASH_ORIGIN = 0x90000000;
 EXTERNAL_FLASH_LENGTH = 8M;
 STANDARD_EXTERNAL_FLASH_SECTOR_LENGTH = 64K;
 
-PERSITING_BYTES_VIRTUAL_ORIGIN = EXTERNAL_FLASH_ORIGIN + EXTERNAL_FLASH_LENGTH - 2 * STANDARD_EXTERNAL_FLASH_SECTOR_LENGTH;
+SLOT_SIZE = 1M+500K;
+
+PERSITING_BYTES_VIRTUAL_ORIGIN = EXTERNAL_FLASH_ORIGIN + SLOT_SIZE - STANDARD_EXTERNAL_FLASH_SECTOR_LENGTH;
 PERSITING_BYTES_LENGTH = STANDARD_EXTERNAL_FLASH_SECTOR_LENGTH;
 
 KERNEL_VIRTUAL_ORIGIN = EXTERNAL_FLASH_ORIGIN;
 KERNEL_LENGTH = 64K;
 
 USERLAND_VIRTUAL_ORIGIN = KERNEL_VIRTUAL_ORIGIN + KERNEL_LENGTH;
-USERLAND_AND_EXTERNAL_APPS_LENGTH = EXTERNAL_FLASH_LENGTH / 2 - KERNEL_LENGTH - PERSITING_BYTES_LENGTH;
+USERLAND_LENGTH = SLOT_SIZE - PERSITING_BYTES_LENGTH - KERNEL_LENGTH;
+
+STORAGE_ORIGIN = EXTERNAL_FLASH_ORIGIN + 2 * SLOT_SIZE;
+STORAGE_SIZE = STORAGE_ORIGIN - EXTERNAL_FLASH_ORIGIN;
+
 
 SIGNED_PAYLOAD_LENGTH = 8;
 CANARY_LENGTH = 4;

diff --git a/ion/src/device/n0110/shared/config_slot_a.ld b/ion/src/device/n0110/shared/config_slot_a.ld
@@ -1,2 +1 @@
 EPSILON_OFFSET = 0;
-EPSILON_SLOT = 0;
diff --git a/ion/src/device/n0110/shared/config_slot_b.ld b/ion/src/device/n0110/shared/config_slot_b.ld
@@ -1,2 +1 @@
 EPSILON_OFFSET = 1M;
-EPSILON_SLOT = 1;
diff --git a/ion/src/device/n0110/userland/flash/storage.ld b/ion/src/device/n0110/userland/flash/storage.ld
@@ -1,4 +1,4 @@
 . = ALIGN(64K);
 _storage_flash_start = .;
-. = (ORIGIN(FLASH_USERLAND) + LENGTH(FLASH_USERLAND));
+. = (ORIGIN(STORAGE) + LENGTH(STORAGE));
 _storage_flash_end = .;
diff --git a/ion/src/device/userland/shared_userland_flash.ld b/ion/src/device/userland/shared_userland_flash.ld
@@ -1,7 +1,8 @@
 USERLAND_ORIGIN = USERLAND_VIRTUAL_ORIGIN + EPSILON_OFFSET;
 
 MEMORY {
-  FLASH_USERLAND (rx) : ORIGIN = USERLAND_ORIGIN, LENGTH = USERLAND_AND_EXTERNAL_APPS_LENGTH
+  FLASH_USERLAND (rx) : ORIGIN = USERLAND_ORIGIN, LENGTH = USERLAND_LENGTH
+  STORAGE (rx) : ORIGIN = STORAGE_ORIGIN, LENGTH = STORAGE_SIZE
   SRAM (rw) : ORIGIN = USERLAND_SRAM_ORIGIN, LENGTH = USERLAND_SRAM_LENGTH
 }
 
@@ -65,7 +66,7 @@ SECTIONS {
 
   .storage_flash : {
     INCLUDE flash/storage.ld
-  } >FLASH_USERLAND
+  } >STORAGE
 
   .bss : {
     /* The bss section contains data for all uninitialized variables