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

artiq_flash: use term 'gateware'

This commit is contained in:
Robert Jördens 2016-02-29 20:45:41 +01:00
parent 5fad570f5e
commit 6dd1eb2e92
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
artiq/frontend/artiq_flash.py
View File

@ -6,7 +6,6 @@ import os
import subprocess import subprocess
import tempfile import tempfile
import artiq
from artiq import __artiq_dir__ as artiq_dir from artiq import __artiq_dir__ as artiq_dir
from artiq.frontend.bit2bin import bit2bin from artiq.frontend.bit2bin import bit2bin
@ -18,13 +17,13 @@ def get_argparser():
epilog="""\ epilog="""\
Valid actions: Valid actions:
* proxy: load the flash proxy bitstream * proxy: load the flash proxy gateware bitstream
* bitstream: write bitstream to flash * gateware: write gateware bitstream to flash
* bios: write bios to flash * bios: write bios to flash
* runtime: write runtime to flash * runtime: write runtime to flash
* storage: write storage image to flash * storage: write storage image to flash
* load: load bitstream into device (volatile but fast) * load: load gateware bitstream into device (volatile but fast)
* start: trigger the target to (re)load its bitstream from flash * start: trigger the target to (re)load its gateware bitstream from flash
Prerequisites: Prerequisites:
@ -42,7 +41,7 @@ Prerequisites:
parser.add_argument("-f", "--storage", help="write file to storage area") parser.add_argument("-f", "--storage", help="write file to storage area")
parser.add_argument("-d", "--dir", help="look for files in this directory") parser.add_argument("-d", "--dir", help="look for files in this directory")
parser.add_argument("ACTION", nargs="*", parser.add_argument("ACTION", nargs="*",
default="proxy bitstream bios runtime start".split(), default="proxy gateware bios runtime start".split(),
help="actions to perform, default: %(default)s") help="actions to perform, default: %(default)s")
return parser return parser
@ -55,7 +54,7 @@ def main():
"kc705": { "kc705": {
"chip": "xc7k325t", "chip": "xc7k325t",
"start": "xc7_program xc7.tap", "start": "xc7_program xc7.tap",
"bitstream": 0x000000, "gateware": 0x000000,
"bios": 0xaf0000, "bios": 0xaf0000,
"runtime": 0xb00000, "runtime": 0xb00000,
"storage": 0xb80000, "storage": 0xb80000,
@ -63,7 +62,7 @@ def main():
"pipistrello": { "pipistrello": {
"chip": "xc6slx45", "chip": "xc6slx45",
"start": "xc6s_program xc6s.tap", "start": "xc6s_program xc6s.tap",
"bitstream": 0x000000, "gateware": 0x000000,
"bios": 0x170000, "bios": 0x170000,
"runtime": 0x180000, "runtime": 0x180000,
"storage": 0x200000, "storage": 0x200000,
@ -90,16 +89,16 @@ def main():
break break
if not proxy: if not proxy:
raise SystemExit( raise SystemExit(
"proxy bitstream {} not found".format(proxy_base)) "proxy gateware bitstream {} not found".format(proxy_base))
prog.append(proxy) prog.append(proxy)
elif action == "bitstream": elif action == "gateware":
bin = os.path.join(opts.dir, "top.bin") bin = os.path.join(opts.dir, "top.bin")
if not os.access(bin, os.R_OK): if not os.access(bin, os.R_OK):
bin = tempfile.mkstemp()[1] bin = tempfile.mkstemp()[1]
bit = os.path.join(opts.dir, "top.bit") bit = os.path.join(opts.dir, "top.bit")
conv = True conv = True
prog.append("jtagspi_program {} 0x{:x}".format( prog.append("jtagspi_program {} 0x{:x}".format(
bin, config["bitstream"])) bin, config["gateware"]))
elif action == "bios": elif action == "bios":
prog.append("jtagspi_program {} 0x{:x}".format( prog.append("jtagspi_program {} 0x{:x}".format(
os.path.join(opts.dir, "bios.bin"), config["bios"])) os.path.join(opts.dir, "bios.bin"), config["bios"]))