Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3633671656cc
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b29e2d5bfe19
Choose a head ref
  • 2 commits
  • 9 files changed
  • 1 contributor

Commits on Jan 24, 2017

  1. doc: test mode was removed, clean up.

    whitequark committed Jan 24, 2017
    Copy the full SHA
    e5085c0 View commit details
  2. Globally update UART baudrate to 921600.

    whitequark committed Jan 24, 2017
    Copy the full SHA
    b29e2d5 View commit details
1 change: 0 additions & 1 deletion artiq/firmware/runtime/lib.rs
Original file line number Diff line number Diff line change
@@ -57,7 +57,6 @@ mod moninj;
mod analyzer;

fn startup() {
board::uart::set_speed(921600);
board::clock::init();
info!("ARTIQ runtime starting...");
info!("software version {}", cfg!(git_describe));
2 changes: 1 addition & 1 deletion artiq/frontend/artiq_devtool.py
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ def drain(chan):

logger.info("Booting runtime")
flterm = run_command(
"{env} python3 flterm.py {serial} " +
"{env} python3 flterm.py {serial} --speed 921600" +
"--kernel /tmp/{tmp}/runtime.bin " +
("--upload-only" if action == "boot" else "--output-only"))
artiq_flash = run_command(
1 change: 1 addition & 0 deletions artiq/gateware/targets/kc705_dds.py
Original file line number Diff line number Diff line change
@@ -112,6 +112,7 @@ def __init__(self, cpu_type="or1k", **kwargs):
sdram_controller_type="minicon",
l2_size=128*1024,
ident=artiq_version,
uart_baudrate=921600,
**kwargs)
AMPSoC.__init__(self)
if isinstance(self.platform.toolchain, XilinxVivadoToolchain):
1 change: 1 addition & 0 deletions artiq/gateware/targets/kc705_drtio_master.py
Original file line number Diff line number Diff line change
@@ -33,6 +33,7 @@ def __init__(self, cfg, medium, **kwargs):
sdram_controller_type="minicon",
l2_size=128*1024,
ident=artiq_version,
uart_baudrate=921600,
**kwargs)
AMPSoC.__init__(self)

1 change: 1 addition & 0 deletions artiq/gateware/targets/kc705_drtio_satellite.py
Original file line number Diff line number Diff line change
@@ -131,6 +131,7 @@ def __init__(self, cfg, medium, **kwargs):
sdram_controller_type="minicon",
l2_size=128*1024,
ident=artiq_version,
uart_baudrate=921600,
**kwargs)

platform = self.platform
1 change: 1 addition & 0 deletions artiq/gateware/targets/phaser.py
Original file line number Diff line number Diff line change
@@ -169,6 +169,7 @@ def __init__(self, cpu_type="or1k", **kwargs):
sdram_controller_type="minicon",
l2_size=128*1024,
ident=artiq_version,
uart_baudrate=921600,
**kwargs)
AMPSoC.__init__(self)
self.platform.toolchain.bitstream_commands.extend([
1 change: 1 addition & 0 deletions artiq/gateware/targets/pipistrello.py
Original file line number Diff line number Diff line change
@@ -160,6 +160,7 @@ def __init__(self, cpu_type="or1k", **kwargs):
l2_size=64*1024,
ident=artiq_version,
clk_freq=75*1000*1000,
uart_baudrate=921600,
**kwargs)
AMPSoC.__init__(self)

49 changes: 4 additions & 45 deletions doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -150,55 +150,14 @@ This should be done after either installation method (conda or source).

.. _flash-mac-ip-addr:

* Set the MAC and IP address in the :ref:`core device configuration flash storage <core-device-flash-storage>`:
* Set the MAC and IP address in the :ref:`core device configuration flash storage <core-device-flash-storage>`: ::

* You can set it through JTAG by generating a flash storage image and then flashing it: ::

$ artiq_mkfs flash_storage.img -s mac xx:xx:xx:xx:xx:xx -s ip xx.xx.xx.xx
$ artiq_flash -f flash_storage.img proxy storage start

* Or, if you have a serial connection ready, you can set it via the runtime test mode command line

* Boot the board.

* Quickly run flterm (in ``path/to/misoc/tools``) to access the serial console.

* If you weren't quick enough to see anything in the serial console, press the reset button.

* Wait for "Press 't' to enter test mode..." to appear and hit the ``t`` key.

* Enter the following commands (which will erase the flash storage content).

::

test> fserase
test> fswrite ip xx.xx.xx.xx
test> fswrite mac xx:xx:xx:xx:xx:xx

* Then reboot.

You should see something like this in the serial console: ::

$ ./tools/flterm --port /dev/ttyUSB1
[FLTERM] Starting...

MiSoC BIOS http://m-labs.hk
(c) Copyright 2007-2014 Sebastien Bourdeauducq
[...]
Press 't' to enter test mode...
Entering test mode.
test> fserase
test> fswrite ip 192.168.10.2
test> fswrite mac 11:22:33:44:55:66

.. note:: The reset button of the KC705 board is the "CPU_RST" labeled button.
.. warning:: Both those instructions will result in the flash storage being wiped out. However you can use the test mode to change the IP/MAC without erasing everything if you skip the "fserase" command.

* (optional) You may also want to set ``netmask`` and ``gateway`` in the same way that you set ``ip``.
$ artiq_mkfs flash_storage.img -s mac xx:xx:xx:xx:xx:xx -s ip xx.xx.xx.xx
$ artiq_flash -f flash_storage.img proxy storage start

* (optional) Flash the idle kernel

The idle kernel is the kernel (some piece of code running on the core device) which the core device runs whenever it is not connected to a PC via ethernet.
The idle kernel is the kernel (some piece of code running on the core device) which the core device runs whenever it is not connected to a PC via Ethernet.
This kernel is therefore stored in the :ref:`core device configuration flash storage <core-device-flash-storage>`.
To flash the idle kernel:

4 changes: 2 additions & 2 deletions doc/manual/installing_from_source.rst
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@ These steps are required to generate gateware bitstream (``.bit``) files, build

* Check that the board boots by running a serial terminal program (you may need to press its FPGA reconfiguration button or power-cycle it to load the gateware bitstream that was newly written into the flash): ::

$ flterm /dev/ttyUSB1
$ flterm /dev/ttyUSB1 --speed 921600
MiSoC BIOS http://m-labs.hk
[...]
Booting from flash...
@@ -197,7 +197,7 @@ These steps are required to generate gateware bitstream (``.bit``) files, build

.. note:: flterm is part of MiSoC. If you installed MiSoC with ``setup.py develop --user``, the flterm launcher is in ``~/.local/bin``.

The communication parameters are 115200 8-N-1. Ensure that your user has access
The communication parameters are 921600 8-N-1. Ensure that your user has access
to the serial device (``sudo adduser $USER dialout`` assuming standard setup).

.. _installing-the-host-side-software: