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

artiq_devtool: --config is no longer supported by artiq_flash. 

[ci skip]
This commit is contained in:
whitequark 2017-11-27 19:46:49 +00:00
parent 66e089b376
commit 277b00eb9d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/frontend/artiq_devtool.py
View File

@ -40,9 +40,6 @@ def get_argparser():
type=str, default="kc705_dds", type=str, default="kc705_dds",
help="Target to build, one of: " help="Target to build, one of: "
"kc705_dds kc705_drtio_master kc705_drtio_satellite") "kc705_dds kc705_drtio_master kc705_drtio_satellite")
parser.add_argument("-c", "--config", metavar="PATH",
type=str, default="openocd-kc705.cfg",
help="OpenOCD configuration file corresponding to the development board")
parser.add_argument("actions", metavar="ACTION", parser.add_argument("actions", metavar="ACTION",
type=str, default=[], nargs="+", type=str, default=[], nargs="+",
@ -120,8 +117,7 @@ def main():
logger.info("Resetting device") logger.info("Resetting device")
client.run_command( client.run_command(
"{env} artiq_flash start" + "{env} artiq_flash start",
(" --target-file " + args.config if args.config else ""),
**substs) **substs)
elif action == "boot" or action == "boot+log": elif action == "boot" or action == "boot+log":
@ -140,8 +136,7 @@ def main():
("--upload-only" if action == "boot" else "--output-only"), ("--upload-only" if action == "boot" else "--output-only"),
**substs) **substs)
artiq_flash = client.spawn_command( artiq_flash = client.spawn_command(
"{env} artiq_flash start" + "{env} artiq_flash start",
(" --target-file " + args.config if args.config else ""),
**substs) **substs)
client.drain(flterm) client.drain(flterm)