From 0edc34a9e5d3790a6692af33e16dff45924e2c5b Mon Sep 17 00:00:00 2001 From: whitequark Date: Sun, 28 Jan 2018 14:57:43 +0000 Subject: [PATCH] artiq_devtool: the proxy artiq_flash action doesn't exist anymore. --- artiq/frontend/artiq_devtool.py | 4 ++-- artiq/frontend/artiq_flash.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/artiq/frontend/artiq_devtool.py b/artiq/frontend/artiq_devtool.py index ae54960a0..e13752f97 100755 --- a/artiq/frontend/artiq_devtool.py +++ b/artiq/frontend/artiq_devtool.py @@ -166,11 +166,11 @@ def main(): elif action == "flash": logger.info("Flashing and booting firmware") - flash("proxy", "bootloader", "firmware", "start") + flash("bootloader", "firmware", "start") elif action == "flash+log": logger.info("Flashing firmware") - flash("proxy", "bootloader", "firmware") + flash("bootloader", "firmware") flterm = client.spawn_command(["flterm", serial, "--output-only"]) logger.info("Booting firmware") diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py index 12d1855e9..0da7fb945 100755 --- a/artiq/frontend/artiq_flash.py +++ b/artiq/frontend/artiq_flash.py @@ -23,7 +23,6 @@ def get_argparser(): epilog="""\ Valid actions: - * proxy: load the flash proxy gateware bitstream * gateware: write gateware bitstream to flash * bootloader: write bootloader to flash * storage: write storage image to flash