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

artiq_flash: use DRTIO RTM gateware

This commit is contained in:
Sebastien Bourdeauducq 2019-10-06 17:28:14 +08:00
parent 4198033657
commit e2a924449d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/frontend/artiq_flash.py
View File

@ -349,7 +349,7 @@ def main():
variants.append(entry.name[len(prefix):]) variants.append(entry.name[len(prefix):])
if args.target == "sayma": if args.target == "sayma":
try: try:
variants.remove("rtm_gateware") variants.remove("rtm")
except ValueError: except ValueError:
pass pass
if len(variants) == 0: if len(variants) == 0:
@ -405,7 +405,7 @@ def main():
programmer.write_binary(*config["gateware"], gateware_bin) programmer.write_binary(*config["gateware"], gateware_bin)
if args.target == "sayma" and variant != "master": if args.target == "sayma" and variant != "master":
rtm_gateware_bin = convert_gateware( rtm_gateware_bin = convert_gateware(
artifact_path("rtm_gateware", "rtm.bit"), header=True) artifact_path("rtm", "gateware", "top.bit"), header=True)
programmer.write_binary(*config["rtm_gateware"], programmer.write_binary(*config["rtm_gateware"],
rtm_gateware_bin) rtm_gateware_bin)
elif action == "bootloader": elif action == "bootloader":
@ -425,7 +425,7 @@ def main():
elif action == "load": elif action == "load":
if args.target == "sayma": if args.target == "sayma":
if variant != "simplesatellite" and variant != "master": if variant != "simplesatellite" and variant != "master":
rtm_gateware_bit = artifact_path("rtm_gateware", "rtm.bit") rtm_gateware_bit = artifact_path("rtm", "gateware", "top.bit")
programmer.load(rtm_gateware_bit, 0) programmer.load(rtm_gateware_bit, 0)
gateware_bit = artifact_path(variant_dir, "gateware", "top.bit") gateware_bit = artifact_path(variant_dir, "gateware", "top.bit")
programmer.load(gateware_bit, 1) programmer.load(gateware_bit, 1)