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

Commits on Mar 21, 2015

  1. Improve installation instructions.

    whitequark committed Mar 21, 2015
    Copy the full SHA
    f26486e View commit details
  2. Merge pull request #13 from whitequark/readme-fixes

    Improve installation instructions
    sbourdeauducq committed Mar 21, 2015
    Copy the full SHA
    e4a71e6 View commit details
Showing with 14 additions and 12 deletions.
  1. +14 −12 doc/manual/installing.rst
26 changes: 14 additions & 12 deletions doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -93,17 +93,19 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
$ git clone --recursive https://github.com/m-labs/misoc
$ export MSCDIR=~/artiq-dev/misoc # append this line to .bashrc

* Build and flash the bitstream and BIOS by running `from the MiSoC top-level directory` ::
* Download and install ARTIQ: ::

$ cd ~/artiq-dev
$ git clone https://github.com/m-labs/artiq
$ python3 setup.py develop --user

* Build and flash the bitstream and BIOS by running `from the MiSoC top-level directory`: ::

$ cd ~/artiq-dev/misoc
$ ./make.py -X ~/artiq-dev/artiq/soc -t artiq_ppro all

* Then, build and flash the ARTIQ runtime:

::
* Then, build and flash the ARTIQ runtime: ::

$ cd ~/artiq-dev
$ git clone https://github.com/m-labs/artiq
$ cd ~/artiq-dev/artiq/soc/runtime
$ make flash

@@ -133,15 +135,15 @@ Installing the host-side software
$ cd ~/artiq-dev/llvm-or1k
$ mkdir build
$ cd ~/artiq-dev/llvm-or1k/build
$ ../configure --prefix=/usr/local/llvm-or1k
$ make ENABLE_OPTIMIZED=1 -j4
$ sudo -E make install ENABLE_OPTIMIZED=1
$ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/llvm-or1k -DLLVM_TARGETS_TO_BUILD=OR1K -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON
$ make -j4
$ sudo make install

$ cd ~/artiq-dev
$ git clone https://github.com/numba/llvmlite
$ cd ~/artiq-dev/llvmlite
$ cat ~/artiq-dev/artiq/patches/llvmlite/* | patch -p1
$ PATH=/usr/local/llvm-or1k/bin:$PATH sudo -E python setup.py install
$ PATH=/usr/local/llvm-or1k/bin:$PATH sudo -E python3 setup.py install

.. note::
llvmlite is in development and its API is not stable yet. Commit ID ``11a8303d02e3d6dd2d1e0e9065701795cd8a979f`` is known to work.
@@ -179,8 +181,8 @@ Installing the host-side software
$ cd ~/artiq-dev/artiq/doc/manual
$ make html

Xubuntu 14.04 specific instructions
-----------------------------------
Ubuntu 14.04 specific instructions
----------------------------------

This command installs all the required packages: ::