Merge branch 'increase-runtime-size'

closes #250

* increase-runtime-size:
  flash: grow runtime limit to 512 kB
  RELEASE_NOTES: update
  flash storage: move to flash + 0x70000
This commit is contained in:
Robert Jördens 2016-01-30 18:58:32 -07:00
commit 9fb5ef4d86
3 changed files with 11 additions and 8 deletions

View File

@ -1,9 +1,12 @@
Release notes
=============
1.0
---
1.0 (unreleased)
----------------
* First release
* Experiments (your code) should use ``from artiq.experiment import *``
* 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.

View File

@ -58,7 +58,7 @@ def main():
"bitstream": 0x000000,
"bios": 0xaf0000,
"runtime": 0xb00000,
"storage": 0xb40000,
"storage": 0xb80000,
},
"pipistrello": {
"chip": "xc6slx45",
@ -66,7 +66,7 @@ def main():
"bitstream": 0x000000,
"bios": 0x170000,
"runtime": 0x180000,
"storage": 0x1c0000,
"storage": 0x200000,
},
}[opts.target]

View File

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