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] 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)