From 34329cf3665728c198beef65b98432ecaf6c70eb Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 13 Aug 2018 12:12:36 +0800
Subject: [PATCH] artiq_flash: target Kasli by default

---
 RELEASE_NOTES.rst             |  2 ++
 artiq/frontend/artiq_flash.py | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 83d10d2ac..0c96a5cd4 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -21,6 +21,8 @@ ARTIQ-4
   server address argument and the notify port.
 * The master now has a ``--name`` argument. If given, the dashboard is labelled
   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``.
 * The ``proxy`` action of ``artiq_flash`` is determined automatically and should
   not be specified manually anymore.
diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
index 5fca7702a..b8b2754bb 100755
--- a/artiq/frontend/artiq_flash.py
+++ b/artiq/frontend/artiq_flash.py
@@ -51,9 +51,9 @@ Prerequisites:
     parser.add_argument("-J", "--jump",
                         type=str, default=None,
                         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: "
-                             "kc705 kasli sayma")
+                             "kasli sayma kc705")
     parser.add_argument("-V", "--variant", default=None,
                         help="board variant")
     parser.add_argument("-I", "--preinit-command", default=[], action="append",
@@ -258,14 +258,6 @@ def main():
     init_logger(args)
 
     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": {
             "programmer":   partial(ProgrammerXC7, board="kasli", proxy="bscan_spi_xc7a100t.bit"),
             "def_variant":  "opticlock",
@@ -283,6 +275,14 @@ def main():
             "firmware":     ("spi1", 0x050000),
             "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]
 
     variant = args.variant