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: 8e41d50145ca
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: 22cd12f721ff
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 20, 2016

  1. Fix typo. And in build of openocd on Ubuntu the aclocal dependency is… 

    … provided by automake.

adduser requires root

conda installation requires user to build OpenOCD by hand.
    @jordens
    Joe Britton authored and jordens committed Mar 20, 2016
    Copy the full SHA
    d069380 View commit details

  2. doc: correctly place the openocd section, link it, add explanation

    @jordens
    jordens committed Mar 20, 2016
    Copy the full SHA
    22cd12f View commit details
Showing with 29 additions and 18 deletions.
  1. +29 −18 doc/manual/installing.rst
47 changes: 29 additions & 18 deletions doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -99,7 +99,34 @@ You now need to flash 3 things on the FPGA board:

They are all shipped in our Conda packages, along with the required flash proxy gateware bitstreams.

First you need to install OpenOCD. Then, you can flash the board:
.. _install-openocd:

Installing OpenOCD
..................

There are several tools that can be used to write the thee binaries into
the core device FPGA board's flash memory. Xilinx ISE (impact) or Vivado work, as does xc3sprog
sometimes. OpenOCD is the recommended and most reliable method. But
it is not currently packaged as a conda package.

The following instructions are for Ubuntu.

::

$ cd ~/artiq-dev
$ git clone https://github.com/ntfreak/openocd.git
$ cd openocd
$ sudo apt-get install build-essential libtool libusb-1.0-0-dev libftdi-dev automake
$ ./bootstrap
$ ./configure
$ make
$ sudo make install
$ sudo cp contrib/99-openocd.rules /etc/udev/rules.d
$ sudo adduser $USER plugdev



Then, you can flash the board:

* For the Pipistrello board::

@@ -189,23 +216,6 @@ These steps are required to generate gateware bitstream (``.bit``) files, build
.. note::
The options ``develop`` and ``--user`` are for setup.py to install Migen in ``~/.local/lib/python3.5``.

.. _install-openocd:

* Install JTAG tools needed to program the Pipistrello and KC705:

::

$ cd ~/artiq-dev
$ git clone https://github.com/ntfreak/openocd.git
$ cd openocd
$ sudo apt-get install build-essentials libtool libusb-1.0-0-dev libftdi-dev
$ ./bootstrap
$ ./configure
$ make
$ sudo make install
$ sudo cp contrib/99-openocd.rules /etc/udev/rules.d
$ adduser $USER plugdev

.. _install-flash-proxy:

* Install the required flash proxy gateware bitstreams:
@@ -222,6 +232,7 @@ These steps are required to generate gateware bitstream (``.bit``) files, build

Then move both files ``~/artiq-dev/bscan_spi_xc6slx45.bit`` and ``~/artiq-dev/bscan_spi_xc7k325t.bit`` to ``~/.migen``, ``/usr/local/share/migen``, or ``/usr/share/migen``.

* :ref:`Download and install OpenOCD <install-openocd>`.

* Download and install MiSoC: ::