[Ion/slots] Fix slot detection and persisting bytes location

numworks · Sep 13, 2021 · 4fb36ce · 4fb36ce
1 parent cc46c1d
commit 4fb36ce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 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_OFFSET;
+PERSITING_BYTES_ORIGIN = PERSITING_BYTES_VIRTUAL_ORIGIN + EPSILON_SLOT * PERSITING_BYTES_LENGTH;
 KERNEL_ORIGIN = KERNEL_VIRTUAL_ORIGIN + EPSILON_OFFSET;
 
 MEMORY {

diff --git a/ion/src/device/n0110/kernel/drivers/board.cpp b/ion/src/device/n0110/kernel/drivers/board.cpp
@@ -328,14 +328,14 @@ void shutdownPeripheralsClocks(bool keepLEDAwake) {
 }
 
 bool isRunningSlotA() {
-  return reinterpret_cast<uint32_t>(&_isr_vector_table_start_flash) < ExternalFlash::Config::StartAddress + ExternalFlash::Config::TotalSize/2;
+  return reinterpret_cast<uint32_t>(&_isr_vector_table_start_flash) < ExternalFlash::Config::StartAddress + 1024*1024;
 }
 
 bool isInReflashableSector(uint32_t address) {
   if (isRunningSlotA()) {
-    return address >= ExternalFlash::Config::StartAddress + ExternalFlash::Config::TotalSize/2 && address < ExternalFlash::Config::EndAddress;
+    return address >= ExternalFlash::Config::StartAddress + 1024*1024 && address < ExternalFlash::Config::EndAddress;
   }
-  return address >= ExternalFlash::Config::StartAddress && address < ExternalFlash::Config::StartAddress + ExternalFlash::Config::TotalSize/2;
+  return address >= ExternalFlash::Config::StartAddress && address < ExternalFlash::Config::StartAddress + 1024*1024;
 }
 
 void switchExecutableSlot(uint32_t leaveAddress) {

diff --git a/ion/src/device/n0110/shared/config_flash.ld b/ion/src/device/n0110/shared/config_flash.ld
@@ -41,7 +41,7 @@ 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;
+PERSITING_BYTES_VIRTUAL_ORIGIN = EXTERNAL_FLASH_ORIGIN + EXTERNAL_FLASH_LENGTH - 2 * STANDARD_EXTERNAL_FLASH_SECTOR_LENGTH;
 PERSITING_BYTES_LENGTH = STANDARD_EXTERNAL_FLASH_SECTOR_LENGTH;
 
 KERNEL_VIRTUAL_ORIGIN = EXTERNAL_FLASH_ORIGIN;

diff --git a/ion/src/device/n0110/shared/config_slot_a.ld b/ion/src/device/n0110/shared/config_slot_a.ld
@@ -1 +1,2 @@
 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 +1,2 @@
 EPSILON_OFFSET = 1M;
+EPSILON_SLOT = 1;
diff --git a/ion/src/device/n0110/shared/drivers/config/board.h b/ion/src/device/n0110/shared/drivers/config/board.h
@@ -31,7 +31,7 @@ constexpr static uint32_t BootloaderTrampolineAddress = BootloaderStartAddress +
 
 // Slots
 constexpr static uint32_t SlotAStartAddress = ExternalFlash::Config::StartAddress;
-constexpr static uint32_t SlotBStartAddress = ExternalFlash::Config::StartAddress + ExternalFlash::Config::TotalSize/2;
+constexpr static uint32_t SlotBStartAddress = ExternalFlash::Config::StartAddress + 1024*1024;
 
 // Kernel
 constexpr static uint32_t KernelSize = 0x10000; // 64kB