From 25ce0928bd17eba0653239d342ef25e969a8e5d7 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Tue, 5 Jan 2016 10:23:50 -0700 Subject: [PATCH] build/doc: simplify proxy bitstream locations --- conda/artiq-kc705-nist_qc1/build.sh | 3 +-- conda/artiq-kc705-nist_qc2/build.sh | 3 +-- conda/artiq-pipistrello-nist_qc1/build.sh | 3 +-- doc/manual/installing.rst | 9 +++++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/conda/artiq-kc705-nist_qc1/build.sh b/conda/artiq-kc705-nist_qc1/build.sh index 453e42868..ba67df3f9 100644 --- a/conda/artiq-kc705-nist_qc1/build.sh +++ b/conda/artiq-kc705-nist_qc1/build.sh @@ -11,5 +11,4 @@ cp misoc_nist_qc1_kc705/gateware/top.bit $SOC_PREFIX cp misoc_nist_qc1_kc705/software/bios/bios.bin $SOC_PREFIX cp misoc_nist_qc1_kc705/software/runtime/runtime.fbi $SOC_PREFIX -wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc7k325t.bit?raw=true -O bscan_spi_xc7k325t.bit -mv bscan_spi_xc7k325t.bit $SOC_PREFIX +wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc7k325t.bit diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh index 90814b310..77c1487fe 100644 --- a/conda/artiq-kc705-nist_qc2/build.sh +++ b/conda/artiq-kc705-nist_qc2/build.sh @@ -11,5 +11,4 @@ cp misoc_nist_qc2_kc705/gateware/top.bit $SOC_PREFIX cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX cp misoc_nist_qc2_kc705/software/runtime/runtime.fbi $SOC_PREFIX -wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc7k325t.bit?raw=true -O bscan_spi_xc7k325t.bit -mv bscan_spi_xc7k325t.bit $SOC_PREFIX +wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc7k325t.bit diff --git a/conda/artiq-pipistrello-nist_qc1/build.sh b/conda/artiq-pipistrello-nist_qc1/build.sh index 5eab990a4..a1c29a8d3 100644 --- a/conda/artiq-pipistrello-nist_qc1/build.sh +++ b/conda/artiq-pipistrello-nist_qc1/build.sh @@ -11,5 +11,4 @@ cp misoc_nist_qc1_pipistrello/gateware/top.bit $SOC_PREFIX cp misoc_nist_qc1_pipistrello/software/bios/bios.bin $SOC_PREFIX cp misoc_nist_qc1_pipistrello/software/runtime/runtime.fbi $SOC_PREFIX -wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc6slx45.bit?raw=true -O bscan_spi_xc6slx45.bit -mv bscan_spi_xc6slx45.bit $SOC_PREFIX +wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc6slx45.bit diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 341cafe3e..2757f9324 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -204,10 +204,10 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC :: $ cd ~/artiq-dev - $ wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc6slx45.bit?raw=true - $ wget https://github.com/jordens/bscan_spi_bitstreams/blob/master/bscan_spi_xc7k325t.bit?raw=true + $ wget https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc7k325t.bit + $ wget https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc6slx45.bit - Then copy 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``. + Then copy 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``. * Download and install MiSoC: :: @@ -268,7 +268,8 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC Executing booted program. ARTIQ runtime built -The communication parameters are 115200 8-N-1. +The communication parameters are 115200 8-N-1. Ensure that your user has access +to the serial device (``sudo adduser $USER dialout`` assuming standard setup). .. _installing-the-host-side-software: