flash storage: move to flash + 0x70000

jordens · jordens · commit e92d52314bd6 · 2016-01-28T18:08:30.000-07:00
This requires recompiling and flashing the runtime and the entire
storage area file system (ip address and idle kernel).

* with ppp the runtime is larger than 0x40000 now
* 0x60000 for the runtime should give enough space for a while,
  even including a fatter scheduler or runtime components
  in other languages
* for both pipistrello and kc705 this leaves the unused space
  starting at a nice round number
* the relevant flashes nowadays are 0x1000000 large
diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
@@ -58,15 +58,15 @@ def main():
             "bitstream": 0x000000,
             "bios": 0xaf0000,
             "runtime": 0xb00000,
-            "storage": 0xb40000,
+            "storage": 0xb70000,
         },
         "pipistrello": {
             "chip": "xc6slx45",
             "start": "xc6s_program xc6s.tap",
             "bitstream": 0x000000,
             "bios": 0x170000,
             "runtime": 0x180000,
-            "storage": 0x1c0000,
+            "storage": 0x1f0000,
         },
     }[opts.target]
 
diff --git a/artiq/runtime/flash_storage.c b/artiq/runtime/flash_storage.c
@@ -14,7 +14,7 @@
 
 #if (defined CSR_SPIFLASH_BASE && defined CONFIG_SPIFLASH_PAGE_SIZE)
 
-#define STORAGE_ADDRESS ((char *)(FLASH_BOOT_ADDRESS + 256*1024))
+#define STORAGE_ADDRESS ((char *)(FLASH_BOOT_ADDRESS + 0x70000))
 #define STORAGE_SIZE    CONFIG_SPIFLASH_SECTOR_SIZE
 #define END_MARKER      (0xFFFFFFFF)
 
