Skip to content

Commit

Permalink
manual: minor cleanup
Browse files Browse the repository at this point in the history
sbourdeauducq committed Jun 22, 2016
1 parent 48c0812 commit 3befe37
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ The conda package contains pre-built binaries that you can directly flash to you

.. warning::
Conda packages are supported for Linux (64-bit) and Windows (32- and 64-bit).
Users of other operating systems (32-bit Linux, BSD, OSX ...) should and can :ref:`install from source <install-from-sources>`.
Users of other operating systems (32-bit Linux, BSD, OSX ...) should and can :ref:`install from source <install-from-source>`.


Installing Anaconda or Miniconda
13 changes: 6 additions & 7 deletions doc/manual/installing_from_source.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
.. _install-from-sources:
.. _install-from-source:


Installing ARTIQ from sources
=============================
Installing ARTIQ from source
============================

.. note::
This method is only recommended for developers and advanced users. An easier way to install ARTIQ is via the Anaconda packages (see :ref:`Installing ARTIQ <install-from-conda>`).


Preparing the build environment for the core device
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
---------------------------------------------------

These steps are required to generate code that can run on the core
device. They are necessary both for building the MiSoC BIOS
@@ -59,7 +58,7 @@ and the ARTIQ kernels.
Compilation of LLVM can take more than 30 min on some machines.

Preparing the core device FPGA board
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
------------------------------------

These steps are required to generate gateware bitstream (``.bit``) files, build the MiSoC BIOS and ARTIQ runtime, and flash FPGA boards. If the board is already flashed, you may skip those steps and go directly to `Installing the host-side software`.

@@ -164,7 +163,7 @@ to the serial device (``sudo adduser $USER dialout`` assuming standard setup).
.. _installing-the-host-side-software:

Installing the host-side software
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
---------------------------------

* Install the llvmlite Python bindings: ::

0 comments on commit 3befe37

Please sign in to comment.