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

artiq_flash: support load action for Sayma RTM FPGA.

This commit is contained in:
whitequark 2018-01-20 07:22:27 +00:00
parent 94592c7a4c
commit 115aa0d0d6
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
artiq/frontend/artiq_flash.py
View File

@ -91,7 +91,7 @@ def find_proxy_bitfile(filename):
full_path = os.path.join(p, filename) full_path = os.path.join(p, filename)
if os.access(full_path, os.R_OK): if os.access(full_path, os.R_OK):
return full_path return full_path
raise FileNotFoundError("proxy bitstream {} not found" raise FileNotFoundError("Cannot find proxy bitstream {}"
.format(filename)) .format(filename))
@ -280,6 +280,13 @@ def main():
programmer = config["programmer"](client, preinit_script=args.preinit_command) programmer = config["programmer"](client, preinit_script=args.preinit_command)
def artifact_path(*path_filename):
if args.srcbuild is None:
*path, filename = path_filename
return os.path.join(bin_dir, filename)
else:
return os.path.join(args.srcbuild, *path_filename)
for action in args.action: for action in args.action:
if action == "proxy": if action == "proxy":
try: try:
@ -287,43 +294,39 @@ def main():
except FileNotFoundError as e: except FileNotFoundError as e:
raise SystemExit(e) raise SystemExit(e)
elif action == "gateware": elif action == "gateware":
if args.srcbuild is None: gateware_bin = artifact_path("gateware", "top.bin")
path = bin_dir if not os.access(gateware_bin, os.R_OK):
else: bin_handle, gateware_bin = tempfile.mkstemp()
path = os.path.join(args.srcbuild, "gateware") gateware_bit = artifact_path("gateware", "top.bit")
bin_filename = os.path.join(path, "top.bin") with open(gateware_bit, "rb") as bit_handle:
if not os.access(bin_filename, os.R_OK):
bin_handle, bin_filename = tempfile.mkstemp()
bit_filename = os.path.join(path, "top.bit")
with open(bit_filename, "rb") as bit_handle:
bit2bin(bit_handle, bin_handle) bit2bin(bit_handle, bin_handle)
atexit.register(lambda: os.unlink(bin_filename)) atexit.register(lambda: os.unlink(gateware_bin))
programmer.flash_binary(*config["gateware"], bin_filename)
programmer.flash_binary(*config["gateware"], gateware_bin)
elif action == "bootloader": elif action == "bootloader":
if args.srcbuild is None: bootloader_bin = artifact_path("software", "bootloader", "bootloader.bin")
path = bin_dir programmer.flash_binary(*config["bootloader"], bootloader_bin)
else:
path = os.path.join(args.srcbuild, "software", "bootloader")
programmer.flash_binary(*config["bootloader"], os.path.join(path, "bootloader.bin"))
elif action == "storage": elif action == "storage":
programmer.flash_binary(*config["storage"], args.storage) storage_img = args.storage
programmer.flash_binary(*config["storage"], storage_img)
elif action == "firmware": elif action == "firmware":
if variant == "satellite": if variant == "satellite":
firmware_name = "satman" firmware = "satman"
else: else:
firmware_name = "runtime" firmware = "runtime"
if args.srcbuild is None:
path = bin_dir firmware_fbi = artifact_path("software", firmware, firmware + ".fbi")
else: programmer.flash_binary(*config["firmware"], firmware_fbi)
path = os.path.join(args.srcbuild, "software", firmware_name)
programmer.flash_binary(*config["firmware"],
os.path.join(path, firmware_name + ".fbi"))
elif action == "load": elif action == "load":
if args.srcbuild is None: if args.target == "sayma_rtm":
path = bin_dir gateware_bit = artifact_path("top.bit")
programmer.load(gateware_bit, 0)
elif args.target == "sayma_amc":
gateware_bit = artifact_path("gateware", "top.bit")
programmer.load(gateware_bit, 1)
else: else:
path = os.path.join(args.srcbuild, "gateware") gateware_bit = artifact_path("gateware", "top.bit")
programmer.load(os.path.join(path, "top.bit")) programmer.load(gateware_bit, 0)
elif action == "start": elif action == "start":
programmer.start() programmer.start()
else: else: