M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

manual: minor cleanup

This commit is contained in:
Sebastien Bourdeauducq 2016-06-22 10:01:56 +08:00
parent 48c0812df0
commit 3befe37221
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual/installing.rst
View File

@ -14,7 +14,7 @@ The conda package contains pre-built binaries that you can directly flash to you
.. warning:: .. warning::
Conda packages are supported for Linux (64-bit) and Windows (32- and 64-bit). 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 Installing Anaconda or Miniconda

13
doc/manual/installing_from_source.rst
View File

@ -1,15 +1,14 @@
.. _install-from-sources: .. _install-from-source:
Installing ARTIQ from source
Installing ARTIQ from sources ============================
=============================
.. note:: .. 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>`). 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 Preparing the build environment for the core device
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------------------------------------------
These steps are required to generate code that can run on the core These steps are required to generate code that can run on the core
device. They are necessary both for building the MiSoC BIOS 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. Compilation of LLVM can take more than 30 min on some machines.
Preparing the core device FPGA board 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`. 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:
Installing the host-side software Installing the host-side software
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------------------------
* Install the llvmlite Python bindings: :: * Install the llvmlite Python bindings: ::