diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 536840335..0008a825a 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -22,6 +22,8 @@ ARTIQ-4 * The master now has a ``--name`` argument. If given, the dashboard is labelled with this name rather than the server address. * ``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. * ``kc705_dds`` has been renamed ``kc705``. * the ``-H/--hw-adapter`` option of ``kc705`` has ben renamed ``-V/--variant``. * SPI masters have been switched from misoc-spi to misoc-spi2. This affects diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 5cd152771..da9affe38 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -161,7 +161,7 @@ This should be done after either installation method (conda or source). * Set the MAC and IP address in the :ref:`core device configuration flash storage ` (see above for the ``-t`` and ``-m`` options to ``artiq_flash`` that may be required): :: $ artiq_mkfs flash_storage.img -s mac xx:xx:xx:xx:xx:xx -s ip xx.xx.xx.xx - $ artiq_flash -t [board] -m [adapter] -f flash_storage.img proxy storage start + $ artiq_flash -t [board] -m [adapter] -f flash_storage.img storage start * (optional) Flash the idle kernel