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: b1f7e751aa62
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: df25c46d010d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 17, 2014

  1. Copy the full SHA
    d1062d8 View commit details
  2. Copy the full SHA
    df25c46 View commit details
Showing with 20 additions and 10 deletions.
  1. +20 −10 doc/manual/installing.rst
30 changes: 20 additions & 10 deletions doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -26,11 +26,11 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC

* Install OpenRISC GCC/binutils toolchain (or1k-elf-...): ::

$ mkdir ~/artiq-dev/openrisc
$ cd ~/artiq-dev/openrisc
$ mkdir ~/artiq-dev
$ cd ~/artiq-dev
$ git clone https://github.com/openrisc/or1k-src
$ mkdir ~/artiq-dev/openrisc/or1k-src/build
$ cd ~/artiq-dev/openrisc/or1k-src/build
$ mkdir ~/artiq-dev/or1k-src/build
$ cd ~/artiq-dev/or1k-src/build
$ ../configure --target=or1k-elf --enable-shared --disable-itcl \
--disable-tk --disable-tcl --disable-winsup \
--disable-gdbtk --disable-libgui --disable-rda \
@@ -40,8 +40,8 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
$ sudo make install

$ git clone https://github.com/openrisc/or1k-gcc
$ mkdir ~/artiq-dev/openrisc/or1k-gcc/build
$ cd ~/artiq-dev/openrisc/or1k-gcc/build
$ mkdir ~/artiq-dev/or1k-gcc/build
$ cd ~/artiq-dev/or1k-gcc/build
$ ../configure --target=or1k-elf --enable-languages=c \
--disable-shared --disable-libssp
$ make -j4
@@ -119,7 +119,7 @@ Installing the host-side software

The main dependency of ARTIQ is LLVM and its Python bindings (http://llvmpy.org). Currently, this installation is tedious because of the OpenRISC support not being merged upstream LLVM and because of incompatibilities between the versions of LLVM that support OpenRISC and the versions of LLVM that support the Python bindings. ::

$ cd ~/artiq-dev/openrisc
$ cd ~/artiq-dev
$ git clone https://github.com/openrisc/llvm-or1k
$ cd ~/artiq-dev/llvm-or1k
$ git checkout b3a48efb2c05ed6cedc5395ae726c6a6573ef3ba
@@ -135,7 +135,7 @@ Installing the host-side software
$ mkdir build
$ cd ~/artiq-dev/llvm-or1k/build
$ ../configure --prefix=/usr/local/llvm-or1k
$ make ENABLE_OPTIMIZED=1 REQUIRES_RTTI=1
$ make ENABLE_OPTIMIZED=1 REQUIRES_RTTI=1 -j4
$ sudo -E make install ENABLE_OPTIMIZED=1 REQUIRES_RTTI=1

$ cd ~/artiq-dev
@@ -159,11 +159,21 @@ Installing the host-side software
$ cd ~/artiq-dev/artiq/doc/manual
$ make html

Xubuntu 14.04 dependencies
--------------------------
Xubuntu 14.04 specific instructions
-----------------------------------

This command installs all the required packages: ::

$ sudo apt-get install build-essential autoconf automake autotools-dev dh-make devscripts fakeroot file git lintian patch patchutils perl xutils-devs git-buildpackage svn-buildpackage python3-pip texinfo flex bison libmpc-dev python3-setuptools python3-numpy python3-scipy python3-sphinx python3-nose python3-dev python-dev subversion cmake libusb-dev libftdi-dev pkg-config

Note that ARTIQ requires Python 3.4 or above.

To set user permissions on the JTAG port of the Papilio Pro, create a ``/etc/udev/rules.d/30-usb-papilio-pro.rules`` file containing the following: ::

SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", GROUP="plugdev"

Then reload ``udev``, add your user to the ``plugdev`` group, and log out and log in again: ::

$ sudo invoke-rc.d udev reload
$ sudo adduser <your username> plugdev
$ logout