M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

flash: grow runtime limit to 512 kB

This commit is contained in:
Robert Jördens 2016-01-30 14:50:15 -07:00
parent 3df67526b9
commit 10d78a5d0b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE_NOTES.rst
View File

@ -9,4 +9,4 @@ Release notes
(and not ``from artiq import *`` as previously) (and not ``from artiq import *`` as previously)
* Core device flash storage has moved due to increased runtime size. * Core device flash storage has moved due to increased runtime size.
This requires reflashing the runtime and the flash storage filesystem image This requires reflashing the runtime and the flash storage filesystem image
or its data. or erase and rewrite its entries.

4
artiq/frontend/artiq_flash.py
View File

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

2
artiq/runtime/flash_storage.c
View File

@ -14,7 +14,7 @@
#if (defined CSR_SPIFLASH_BASE && defined CONFIG_SPIFLASH_PAGE_SIZE) #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 STORAGE_SIZE CONFIG_SPIFLASH_SECTOR_SIZE
#define END_MARKER (0xFFFFFFFF) #define END_MARKER (0xFFFFFFFF)