Merge branch 'increase-runtime-size'

jordens · jordens · commit 9fb5ef4d86c1 · 2016-01-30T18:58:32.000-07:00
closes #250 * increase-runtime-size: flash: grow runtime limit to 512 kB RELEASE_NOTES: update flash storage: move to flash + 0x70000
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -1,9 +1,12 @@
 Release notes
 =============
 
-1.0
----
+1.0 (unreleased)
+----------------
 
-  * First release
-  * Experiments (your code) should use ``from artiq.experiment import *``
-    (and not ``from artiq import *`` as previously)
+* First release
+* Experiments (your code) should use ``from artiq.experiment import *``
+  (and not ``from artiq import *`` as previously)
+* Core device flash storage has moved due to increased runtime size.
+  This requires reflashing the runtime and the flash storage filesystem image
+  or erase and rewrite its entries.
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": 0xb80000,
         },
         "pipistrello": {
             "chip": "xc6slx45",
             "start": "xc6s_program xc6s.tap",
             "bitstream": 0x000000,
             "bios": 0x170000,
             "runtime": 0x180000,
-            "storage": 0x1c0000,
+            "storage": 0x200000,
         },
     }[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 + 0x80000 /* max runtime size */))
 #define STORAGE_SIZE    CONFIG_SPIFLASH_SECTOR_SIZE
 #define END_MARKER      (0xFFFFFFFF)
 
