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

artiq_flash: select Sayma standalone variant by default

This commit is contained in:
Sebastien Bourdeauducq 2017-12-22 16:53:58 +08:00
parent 44959144d8
commit cbd69287a7
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES.rst
View File

@ -11,6 +11,7 @@ Release notes
server address argument and the notify port. server address argument and the notify port.
* The master now has a ``--name`` argument. If given, the dashboard is labelled * The master now has a ``--name`` argument. If given, the dashboard is labelled
with this name rather than the server address. with this name rather than the server address.
* ``artiq_flash --adapter`` has been changed to ``artiq_flash --variant``.
3.1 3.1

22
artiq/frontend/artiq_flash.py
View File

@ -37,8 +37,8 @@ Prerequisites:
""") """)
parser.add_argument("-t", "--target", default="kc705", parser.add_argument("-t", "--target", default="kc705",
help="target board, default: %(default)s") help="target board, default: %(default)s")
parser.add_argument("-m", "--adapter", default=None, parser.add_argument("-m", "--variant", default=None,
help="target adapter, default: board-dependent") help="board variant")
parser.add_argument("--preinit-command", default=[], action="append", parser.add_argument("--preinit-command", default=[], action="append",
help="add a pre-initialization OpenOCD command. " help="add a pre-initialization OpenOCD command. "
"Useful for selecting a development board " "Useful for selecting a development board "
@ -192,7 +192,7 @@ def main():
"kc705": { "kc705": {
"programmer_factory": partial(ProgrammerJtagSpi7, "kc705"), "programmer_factory": partial(ProgrammerJtagSpi7, "kc705"),
"proxy_bitfile": "bscan_spi_xc7k325t.bit", "proxy_bitfile": "bscan_spi_xc7k325t.bit",
"adapters": ["nist_clock", "nist_qc2"], "variants": ["nist_clock", "nist_qc2"],
"gateware": (0, 0x000000), "gateware": (0, 0x000000),
"bios": (0, 0xaf0000), "bios": (0, 0xaf0000),
"runtime": (0, 0xb00000), "runtime": (0, 0xb00000),
@ -201,7 +201,7 @@ def main():
"sayma": { "sayma": {
"programmer_factory": ProgrammerSayma, "programmer_factory": ProgrammerSayma,
"proxy_bitfile": "bscan_spi_xcku040-sayma.bit", "proxy_bitfile": "bscan_spi_xcku040-sayma.bit",
"adapters": [], "variants": ["standalone"],
"gateware": (0, 0x000000), "gateware": (0, 0x000000),
"bios": (1, 0x000000), "bios": (1, 0x000000),
"runtime": (1, 0x010000), "runtime": (1, 0x010000),
@ -209,19 +209,19 @@ def main():
}, },
}[opts.target] }[opts.target]
adapter = opts.adapter variant = opts.variant
if adapter is not None and adapter not in config["adapters"]: if variant is not None and variant not in config["variants"]:
raise SystemExit("Invalid adapter for this board") raise SystemExit("Invalid variant for this board")
if adapter is None and config["adapters"]: if variant is None and config["variants"]:
adapter = config["adapters"][0] variant = config["variants"][0]
bin_dir = opts.dir bin_dir = opts.dir
if bin_dir is None: if bin_dir is None:
if adapter is None: if variant is None:
bin_dir = os.path.join(artiq_dir, "binaries", bin_dir = os.path.join(artiq_dir, "binaries",
"{}".format(opts.target)) "{}".format(opts.target))
else: else:
bin_dir = os.path.join(artiq_dir, "binaries", bin_dir = os.path.join(artiq_dir, "binaries",
"{}-{}".format(opts.target, adapter)) "{}-{}".format(opts.target, variant))
if opts.srcbuild is None and not os.path.exists(bin_dir) and opts.action != ["start"]: if opts.srcbuild is None and not os.path.exists(bin_dir) and opts.action != ["start"]:
raise SystemExit("Binaries directory '{}' does not exist" raise SystemExit("Binaries directory '{}' does not exist"
.format(bin_dir)) .format(bin_dir))