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

artiq_devtool: add support for switching targets.

This commit is contained in:
whitequark 2017-02-03 07:38:40 +00:00
parent a8ecbd6041
commit 4164fc880e
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
artiq/frontend/artiq_devtool.py
View File

@ -25,12 +25,15 @@ def get_argparser():
parser.add_argument("--host", metavar="HOST", parser.add_argument("--host", metavar="HOST",
type=str, default="lab.m-labs.hk", type=str, default="lab.m-labs.hk",
help="SSH host where the development board is located") help="SSH host where the development board is located")
parser.add_argument("--serial", metavar="SERIAL", parser.add_argument("-s", "--serial", metavar="SERIAL",
type=str, default="/dev/ttyUSB0", type=str, default="/dev/ttyUSB0",
help="TTY device corresponding to the development board") help="TTY device corresponding to the development board")
parser.add_argument("--ip", metavar="IP", parser.add_argument("-i", "--ip", metavar="IP",
type=str, default="kc705.lab.m-labs.hk", type=str, default="kc705.lab.m-labs.hk",
help="IP address corresponding to the development board") help="IP address corresponding to the development board")
parser.add_argument("-t", "--target", metavar="TARGET",
type=str, default="kc705_dds",
help="Target to build (one of: kc705_dds kc705_drtio_satellite)")
parser.add_argument("actions", metavar="ACTION", parser.add_argument("actions", metavar="ACTION",
type=str, default=[], nargs="+", type=str, default=[], nargs="+",
@ -43,6 +46,13 @@ def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
init_logger(args) init_logger(args)
if args.target == "kc705_dds":
firmware = "runtime"
elif args.target == "kc705_drtio_satellite":
firmware = "satman"
else:
raise NotImplementedError("unknown target {}".format(args.target))
ssh = None ssh = None
def get_ssh(): def get_ssh():
nonlocal ssh nonlocal ssh
@ -70,7 +80,8 @@ def main():
logger.info("Executing {}".format(cmd)) logger.info("Executing {}".format(cmd))
chan = get_ssh().get_transport().open_session() chan = get_ssh().get_transport().open_session()
chan.set_combine_stderr(True) chan.set_combine_stderr(True)
chan.exec_command(cmd.format(tmp=tmp, env=env, serial=args.serial, ip=args.ip, **kws)) chan.exec_command(cmd.format(tmp=tmp, env=env, serial=args.serial, ip=args.ip,
firmware=firmware, **kws))
return chan.makefile() return chan.makefile()
def drain(chan): def drain(chan):
@ -82,26 +93,28 @@ def main():
for action in args.actions: for action in args.actions:
if action == "build": if action == "build":
logger.info("Building runtime") logger.info("Building firmware")
try: try:
subprocess.check_call(["python3", "-m", "artiq.gateware.targets.kc705_dds", subprocess.check_call(["python3",
"-H", "nist_clock", "-m", "artiq.gateware.targets." + args.target,
"--no-compile-gateware", "--no-compile-gateware",
"--output-dir", "/tmp/kc705"]) "--output-dir",
"/tmp/{target}".format(target=args.target)])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
logger.error("Build failed") logger.error("Build failed")
sys.exit(1) sys.exit(1)
elif action == "boot" or action == "boot+log": elif action == "boot" or action == "boot+log":
logger.info("Uploading runtime") logger.info("Uploading firmware")
get_sftp().mkdir("/tmp/{tmp}".format(tmp=tmp)) get_sftp().mkdir("/tmp/{tmp}".format(tmp=tmp))
get_sftp().put("/tmp/kc705/software/runtime/runtime.bin", get_sftp().put("/tmp/{target}/software/{firmware}/{firmware}.bin"
"/tmp/{tmp}/runtime.bin".format(tmp=tmp)) .format(target=args.target, firmware=firmware),
"/tmp/{tmp}/{firmware}.bin".format(tmp=tmp, firmware=firmware))
logger.info("Booting runtime") logger.info("Booting firmware")
flterm = run_command( flterm = run_command(
"{env} python3 flterm.py {serial} " + "{env} python3 flterm.py {serial} " +
"--kernel /tmp/{tmp}/runtime.bin " + "--kernel /tmp/{tmp}/{firmware}.bin " +
("--upload-only" if action == "boot" else "--output-only")) ("--upload-only" if action == "boot" else "--output-only"))
artiq_flash = run_command( artiq_flash = run_command(
"{env} artiq_flash start") "{env} artiq_flash start")