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

artiq_devtool: fix the hotswap action.

This commit is contained in:
whitequark 2018-02-14 23:10:27 +00:00
parent fe50018037
commit d572c0c34d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/frontend/artiq_devtool.py
View File

@ -81,8 +81,10 @@ def main():
if args.target == "kc705": if args.target == "kc705":
board_type, firmware = "kc705", "runtime" board_type, firmware = "kc705", "runtime"
variant = "nist_clock" if args.variant is None else args.variant
elif args.target == "sayma": elif args.target == "sayma":
board_type, firmware = "sayma", "runtime" board_type, firmware = "sayma", "runtime"
variant = "standalone" if args.variant is None else args.variant
else: else:
raise NotImplementedError("unknown target {}".format(args.target)) raise NotImplementedError("unknown target {}".format(args.target))
@ -137,12 +139,12 @@ def main():
logger.error(on_failure) logger.error(on_failure)
sys.exit(1) sys.exit(1)
def build(target, *extra_args, output_dir=build_dir(), variant=args.variant): def build(target, *extra_args, output_dir=build_dir(), variant=variant):
build_args = ["python3", "-m", "artiq.gateware.targets." + target, *extra_args] build_args = ["python3", "-m", "artiq.gateware.targets." + target, *extra_args]
if not args.build_gateware: if not args.build_gateware:
build_args.append("--no-compile-gateware") build_args.append("--no-compile-gateware")
if variant: if variant:
build_args += ["--variant", args.variant] build_args += ["--variant", variant]
build_args += ["--output-dir", output_dir] build_args += ["--output-dir", output_dir]
command(*build_args, on_failure="Build failed") command(*build_args, on_failure="Build failed")
@ -154,8 +156,7 @@ def main():
flash_args.append("-v") flash_args.append("-v")
flash_args += ["-H", args.host] flash_args += ["-H", args.host]
flash_args += ["-t", board_type] flash_args += ["-t", board_type]
if args.variant: flash_args += ["-V", variant]
flash_args += ["-V", args.variant]
flash_args += ["-I", "source {}".format(board_file)] flash_args += ["-I", "source {}".format(board_file)]
flash_args += ["--srcbuild", build_dir()] flash_args += ["--srcbuild", build_dir()]
flash_args += steps flash_args += steps
@ -248,7 +249,7 @@ def main():
elif action == "hotswap": elif action == "hotswap":
logger.info("Hotswapping firmware") logger.info("Hotswapping firmware")
firmware = build_dir("software", firmware, firmware + ".bin") firmware = build_dir(variant, "software", firmware, firmware + ".bin")
command("artiq_coreboot", "hotswap", firmware, command("artiq_coreboot", "hotswap", firmware,
on_failure="Hotswapping failed") on_failure="Hotswapping failed")