srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

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
This commit is contained in:
Robert Jördens 2016-01-28 18:02:51 -07:00
parent 4a29f0702f
commit e92d52314b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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": 0xb40000, "storage": 0xb70000,
}, },
"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": 0x1c0000, "storage": 0x1f0000,
}, },
}[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 + 256*1024)) #define STORAGE_ADDRESS ((char *)(FLASH_BOOT_ADDRESS + 0x70000))
#define STORAGE_SIZE CONFIG_SPIFLASH_SECTOR_SIZE #define STORAGE_SIZE CONFIG_SPIFLASH_SECTOR_SIZE
#define END_MARKER (0xFFFFFFFF) #define END_MARKER (0xFFFFFFFF)