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

artiq_devtool: the proxy artiq_flash action doesn't exist anymore.

This commit is contained in:
whitequark 2018-01-28 14:57:43 +00:00
parent 9a94482c6e
commit 0edc34a9e5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/frontend/artiq_devtool.py
View File

@ -166,11 +166,11 @@ def main():
elif action == "flash": elif action == "flash":
logger.info("Flashing and booting firmware") logger.info("Flashing and booting firmware")
flash("proxy", "bootloader", "firmware", "start") flash("bootloader", "firmware", "start")
elif action == "flash+log": elif action == "flash+log":
logger.info("Flashing firmware") logger.info("Flashing firmware")
flash("proxy", "bootloader", "firmware") flash("bootloader", "firmware")
flterm = client.spawn_command(["flterm", serial, "--output-only"]) flterm = client.spawn_command(["flterm", serial, "--output-only"])
logger.info("Booting firmware") logger.info("Booting firmware")

1
artiq/frontend/artiq_flash.py
View File

@ -23,7 +23,6 @@ def get_argparser():
epilog="""\ epilog="""\
Valid actions: Valid actions:
* proxy: load the flash proxy gateware bitstream
* gateware: write gateware bitstream to flash * gateware: write gateware bitstream to flash
* bootloader: write bootloader to flash * bootloader: write bootloader to flash
* storage: write storage image to flash * storage: write storage image to flash