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

flash: tcl-quote paths (c.f. #256)

This commit is contained in:
Robert Jördens 2016-05-16 23:15:12 +02:00
parent 18878ba050
commit 109ddf919e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/frontend/artiq_flash.py
View File

@ -88,7 +88,7 @@ def main():
"/usr/local/share/migen", "/usr/share/migen"]: "/usr/local/share/migen", "/usr/share/migen"]:
proxy_ = os.path.join(p, proxy_base) proxy_ = os.path.join(p, proxy_base)
if os.access(proxy_, os.R_OK): if os.access(proxy_, os.R_OK):
proxy = "jtagspi_init 0 {}".format(proxy_) proxy = "jtagspi_init 0 {{{}}}".format(proxy_)
break break
if not proxy: if not proxy:
raise SystemExit( raise SystemExit(
@ -100,19 +100,19 @@ def main():
bin_handle, bin = tempfile.mkstemp() bin_handle, bin = tempfile.mkstemp()
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["gateware"])) 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"]))
elif action == "runtime": elif action == "runtime":
prog.append("jtagspi_program {} 0x{:x}".format( prog.append("jtagspi_program {{{}}} 0x{:x}".format(
os.path.join(opts.dir, "runtime.fbi"), config["runtime"])) os.path.join(opts.dir, "runtime.fbi"), config["runtime"]))
elif action == "storage": elif action == "storage":
prog.append("jtagspi_program {} 0x{:x}".format( prog.append("jtagspi_program {{{}}} 0x{:x}".format(
opts.storage, config["storage"])) opts.storage, config["storage"]))
elif action == "load": elif action == "load":
prog.append("pld load 0 {}".format( prog.append("pld load 0 {{{}}}".format(
os.path.join(opts.dir, "top.bit"))) os.path.join(opts.dir, "top.bit")))
elif action == "start": elif action == "start":
prog.append(config["start"]) prog.append(config["start"])