From a6b45caefa35e5379486d69e253c7b9bb500a855 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Fri, 20 Oct 2017 19:44:50 +0200 Subject: [PATCH] conda: new openocd * new jtagspi protocol * new proxy bitstreams --- conda/artiq-dev/meta.yaml | 2 +- conda/artiq-kc705-nist_clock/build.sh | 2 +- conda/artiq-kc705-nist_qc2/build.sh | 2 +- conda/artiq-kc705-phaser/build.sh | 2 +- doc/manual/developing.rst | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 9c63ec654..dc8bad20a 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -22,7 +22,7 @@ requirements: - llvmlite-artiq 0.12.0 - rust-core-or1k 1.20.0 16 - cargo 0.11.0 - - openocd >=0.10 + - openocd >=0.10.0+git - lit - outputcheck - coverage diff --git a/conda/artiq-kc705-nist_clock/build.sh b/conda/artiq-kc705-nist_clock/build.sh index 0e0b7843a..790873e12 100644 --- a/conda/artiq-kc705-nist_clock/build.sh +++ b/conda/artiq-kc705-nist_clock/build.sh @@ -11,4 +11,4 @@ cp misoc_nist_clock_kc705/gateware/top.bit $SOC_PREFIX cp misoc_nist_clock_kc705/software/bios/bios.bin $SOC_PREFIX cp misoc_nist_clock_kc705/software/runtime/runtime.fbi $SOC_PREFIX -wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit +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 5d6e92c69..1066dcc5e 100644 --- a/conda/artiq-kc705-nist_qc2/build.sh +++ b/conda/artiq-kc705-nist_qc2/build.sh @@ -11,4 +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 -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit +wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc7k325t.bit diff --git a/conda/artiq-kc705-phaser/build.sh b/conda/artiq-kc705-phaser/build.sh index b03c1c7ab..c077e8bd0 100644 --- a/conda/artiq-kc705-phaser/build.sh +++ b/conda/artiq-kc705-phaser/build.sh @@ -11,4 +11,4 @@ cp misoc_phaser_kc705/gateware/top.bit $SOC_PREFIX cp misoc_phaser_kc705/software/bios/bios.bin $SOC_PREFIX cp misoc_phaser_kc705/software/runtime/runtime.fbi $SOC_PREFIX -wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit +wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc7k325t.bit diff --git a/doc/manual/developing.rst b/doc/manual/developing.rst index 6fc5673ee..1372d40c9 100644 --- a/doc/manual/developing.rst +++ b/doc/manual/developing.rst @@ -161,7 +161,7 @@ These steps are required to generate gateware bitstream (``.bit``) files, build :: $ cd ~/artiq-dev - $ wget https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit + $ wget https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc7k325t.bit Then move ``~/artiq-dev/bscan_spi_xc7k325t.bit`` to ``~/.migen``, ``/usr/local/share/migen``, or ``/usr/share/migen``.