From 8e41d50145ca8698a7e251bbbe7c3bc7d8534ae3 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Sun, 20 Mar 2016 19:57:07 +0100 Subject: [PATCH 1/4] doc: add pipistrello adapter explicitly (closes: #339) --- doc/manual/installing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 43f7540dd..52e4a2dbf 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -103,7 +103,7 @@ First you need to install OpenOCD. Then, you can flash the board: * For the Pipistrello board:: - $ artiq_flash -t pipistrello + $ artiq_flash -t pipistrello -m qc1 * For the KC705 board:: From d069380f6b68403e5e3bd05bbb252e1eb589ca0a Mon Sep 17 00:00:00 2001 From: Joe Britton Date: Sun, 20 Mar 2016 11:28:18 -0600 Subject: [PATCH 2/4] 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. --- doc/manual/installing.rst | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 52e4a2dbf..7b3b4508f 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -40,6 +40,27 @@ If your ``$PATH`` misses reference the ``miniconda3/bin`` or ``anaconda3/bin`` y $ export PATH=$HOME/miniconda3/bin:$PATH +.. _install-openocd: + +Installing OpenOCD +^^^^^^^^^^^^^^^^^^^ +The following instructions are for Ubuntu. + +* 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-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 + Installing the ARTIQ packages ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -189,23 +210,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: From 22cd12f721ff541553cbfa6e80c43e73fd6b63dc Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Sun, 20 Mar 2016 20:19:12 +0100 Subject: [PATCH 3/4] doc: correctly place the openocd section, link it, add explanation --- doc/manual/installing.rst | 51 ++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 7b3b4508f..85fc066f4 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -40,27 +40,6 @@ If your ``$PATH`` misses reference the ``miniconda3/bin`` or ``anaconda3/bin`` y $ export PATH=$HOME/miniconda3/bin:$PATH -.. _install-openocd: - -Installing OpenOCD -^^^^^^^^^^^^^^^^^^^ -The following instructions are for Ubuntu. - -* 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-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 - Installing the ARTIQ packages ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -120,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:: @@ -226,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 `. * Download and install MiSoC: :: From 8f54a1e6194733ef39859a408cd4ff2564e4cf5d Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Mon, 21 Mar 2016 13:47:32 +0100 Subject: [PATCH 4/4] pipistrello: sys_clk 83 -> 75 MHz This should close #341 once migen generates stable output. --- artiq/gateware/targets/pipistrello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/artiq/gateware/targets/pipistrello.py b/artiq/gateware/targets/pipistrello.py index 2b2c7de65..6a6d1366d 100755 --- a/artiq/gateware/targets/pipistrello.py +++ b/artiq/gateware/targets/pipistrello.py @@ -147,6 +147,7 @@ class NIST_QC1(BaseSoC, AMPSoC): l2_size=64*1024, with_timer=False, ident=artiq_version, + clk_freq=75*1000*1000, **kwargs) AMPSoC.__init__(self)