From e92d52314bd663122a5a52f4da3346bfe3ef2d1a Mon Sep 17 00:00:00 2001
From: Robert Jordens <jordens@gmail.com>
Date: Thu, 28 Jan 2016 18:02:51 -0700
Subject: [PATCH 1/3] flash storage: move to flash + 0x70000

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
---
 artiq/frontend/artiq_flash.py | 4 ++--
 artiq/runtime/flash_storage.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
index 8d484cc41..40bd1178a 100755
--- a/artiq/frontend/artiq_flash.py
+++ b/artiq/frontend/artiq_flash.py
@@ -58,7 +58,7 @@ def main():
             "bitstream": 0x000000,
             "bios": 0xaf0000,
             "runtime": 0xb00000,
-            "storage": 0xb40000,
+            "storage": 0xb70000,
         },
         "pipistrello": {
             "chip": "xc6slx45",
@@ -66,7 +66,7 @@ def main():
             "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
index 654748031..a69a879a4 100644
--- 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)
 

From 3df67526b93a8972d6f90a2df21fa84c5d39a6dc Mon Sep 17 00:00:00 2001
From: Robert Jordens <jordens@gmail.com>
Date: Thu, 28 Jan 2016 21:55:03 -0700
Subject: [PATCH 2/3] RELEASE_NOTES: update

---
 RELEASE_NOTES.rst | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index fc8f26d92..390421647 100644
--- 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 its data.

From 10d78a5d0b0abe55d8568b6e9a99bdf12bf25096 Mon Sep 17 00:00:00 2001
From: Robert Jordens <jordens@gmail.com>
Date: Sat, 30 Jan 2016 14:50:15 -0700
Subject: [PATCH 3/3] flash: grow runtime limit to 512 kB

---
 RELEASE_NOTES.rst             | 2 +-
 artiq/frontend/artiq_flash.py | 4 ++--
 artiq/runtime/flash_storage.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 390421647..7ea7ce122 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -9,4 +9,4 @@ Release notes
   (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 its data.
+  or erase and rewrite its entries.
diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
index 40bd1178a..82cb27939 100755
--- a/artiq/frontend/artiq_flash.py
+++ b/artiq/frontend/artiq_flash.py
@@ -58,7 +58,7 @@ def main():
             "bitstream": 0x000000,
             "bios": 0xaf0000,
             "runtime": 0xb00000,
-            "storage": 0xb70000,
+            "storage": 0xb80000,
         },
         "pipistrello": {
             "chip": "xc6slx45",
@@ -66,7 +66,7 @@ def main():
             "bitstream": 0x000000,
             "bios": 0x170000,
             "runtime": 0x180000,
-            "storage": 0x1f0000,
+            "storage": 0x200000,
         },
     }[opts.target]
 
diff --git a/artiq/runtime/flash_storage.c b/artiq/runtime/flash_storage.c
index a69a879a4..68a231716 100644
--- 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 + 0x70000))
+#define STORAGE_ADDRESS ((char *)(FLASH_BOOT_ADDRESS + 0x80000 /* max runtime size */))
 #define STORAGE_SIZE    CONFIG_SPIFLASH_SECTOR_SIZE
 #define END_MARKER      (0xFFFFFFFF)