M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-27 12:18:26 +08:00
Code Issues Projects Releases Wiki Activity

frontend: make coremgmt flash zynq-compatible

Browse Source
This commit is contained in:
occheung 2024-09-19 09:46:17 +08:00
parent 2b73d5a4c6
commit 5c21649d10
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/coredevice/comm_mgmt.py
View File

@ -208,6 +208,7 @@ class CommMgmt:
for filename in bin_paths: for filename in bin_paths:
with open(filename, "rb") as fi: with open(filename, "rb") as fi:
bin_ = fi.read() bin_ = fi.read()
if (len(bin_paths) > 1):
image_buf.write(struct.pack(self.endian + "I", len(bin_))) image_buf.write(struct.pack(self.endian + "I", len(bin_)))
image_buf.write(bin_) image_buf.write(bin_)

8
artiq/frontend/artiq_coremgmt.py
View File

@ -94,6 +94,9 @@ def get_argparser():
t_flash = tools.add_parser("flash", t_flash = tools.add_parser("flash",
help="flash the running system") help="flash the running system")
p_zynq = t_flash.add_argument("-z", "--zynq", default=False,
help="target zynq device", action="store_true")
p_directory = t_flash.add_argument("directory", metavar="DIRECTORY", type=str, p_directory = t_flash.add_argument("directory", metavar="DIRECTORY", type=str,
help="directory that contains the binaries") help="directory that contains the binaries")
@ -160,6 +163,10 @@ def main():
mgmt.config_erase() mgmt.config_erase()
if args.tool == "flash": if args.tool == "flash":
if args.zynq:
boot = os.path.join(args.directory, "boot.bin")
bins = [ boot ]
else:
def artifact_path(this_binary_dir, *path_filename): def artifact_path(this_binary_dir, *path_filename):
if args.srcbuild: if args.srcbuild:
# source tree - use path elements to locate file # source tree - use path elements to locate file
@ -194,6 +201,7 @@ def main():
firmware = firmwares[0] firmware = firmwares[0]
bins = [ gateware, bootloader, firmware ] bins = [ gateware, bootloader, firmware ]
mgmt.flash(bins) mgmt.flash(bins)
if args.tool == "reboot": if args.tool == "reboot":