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

artiq_flash: target Kasli by default

This commit is contained in:
Sebastien Bourdeauducq 2018-08-13 12:12:36 +08:00
parent 0e32a165c2
commit c172ec6de9
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE_NOTES.rst
View File

@ -21,6 +21,8 @@ ARTIQ-4
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`` targets Kasli by default. Use ``-t kc705`` to flash a KC705
instead.
* ``artiq_flash -m/--adapter`` has been changed to ``artiq_flash -V/--variant``. * ``artiq_flash -m/--adapter`` has been changed to ``artiq_flash -V/--variant``.
* The ``proxy`` action of ``artiq_flash`` is determined automatically and should * The ``proxy`` action of ``artiq_flash`` is determined automatically and should
not be specified manually anymore. not be specified manually anymore.

20
artiq/frontend/artiq_flash.py
View File

@ -51,9 +51,9 @@ Prerequisites:
parser.add_argument("-J", "--jump", parser.add_argument("-J", "--jump",
type=str, default=None, type=str, default=None,
help="SSH host to jump through") help="SSH host to jump through")
parser.add_argument("-t", "--target", default="kc705", parser.add_argument("-t", "--target", default="kasli",
help="target board, default: %(default)s, one of: " help="target board, default: %(default)s, one of: "
"kc705 kasli sayma") "kasli sayma kc705")
parser.add_argument("-V", "--variant", default=None, parser.add_argument("-V", "--variant", default=None,
help="board variant") help="board variant")
parser.add_argument("-I", "--preinit-command", default=[], action="append", parser.add_argument("-I", "--preinit-command", default=[], action="append",
@ -258,14 +258,6 @@ def main():
init_logger(args) init_logger(args)
config = { config = {
"kc705": {
"programmer": partial(ProgrammerXC7, board="kc705", proxy="bscan_spi_xc7k325t.bit"),
"def_variant": "nist_clock",
"gateware": ("spi0", 0x000000),
"bootloader": ("spi0", 0xaf0000),
"storage": ("spi0", 0xb30000),
"firmware": ("spi0", 0xb40000),
},
"kasli": { "kasli": {
"programmer": partial(ProgrammerXC7, board="kasli", proxy="bscan_spi_xc7a100t.bit"), "programmer": partial(ProgrammerXC7, board="kasli", proxy="bscan_spi_xc7a100t.bit"),
"def_variant": "opticlock", "def_variant": "opticlock",
@ -283,6 +275,14 @@ def main():
"firmware": ("spi1", 0x050000), "firmware": ("spi1", 0x050000),
"rtm_gateware": ("spi1", 0x200000), "rtm_gateware": ("spi1", 0x200000),
}, },
"kc705": {
"programmer": partial(ProgrammerXC7, board="kc705", proxy="bscan_spi_xc7k325t.bit"),
"def_variant": "nist_clock",
"gateware": ("spi0", 0x000000),
"bootloader": ("spi0", 0xaf0000),
"storage": ("spi0", 0xb30000),
"firmware": ("spi0", 0xb40000),
},
}[args.target] }[args.target]
variant = args.variant variant = args.variant