From 7edff48b6d1eb9a7ce078753aeec6d9e59dc6427 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Mon, 23 Oct 2017 15:21:51 +0200 Subject: [PATCH] conda/artiq_flash: use proxy bitstream package fix #841 --- artiq/frontend/artiq_flash.py | 10 +++++++++- 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 -- conda/artiq/meta.yaml | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py index 5536565cd..0f9deb44f 100755 --- a/artiq/frontend/artiq_flash.py +++ b/artiq/frontend/artiq_flash.py @@ -58,6 +58,14 @@ def scripts_path(): return p +def proxy_path(): + p = ["share", "bscan-spi-bitstreams"] + p = os.path.abspath(os.path.join( + os.path.dirname(shutil.which("openocd")), + "..", *p)) + return p + + class Programmer: def __init__(self, target_file): self.target_file = target_file @@ -218,7 +226,7 @@ def main(): for action in opts.action: if action == "proxy": proxy_found = False - for p in [bin_dir, os.path.expanduser("~/.migen"), + for p in [bin_dir, proxy_path(), os.path.expanduser("~/.migen"), "/usr/local/share/migen", "/usr/share/migen"]: proxy_bitfile = os.path.join(p, config["proxy_bitfile"]) if os.access(proxy_bitfile, os.R_OK): diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 6b7274a37..e8689987b 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.0+git + - openocd 0.10.0+git 2 - lit - outputcheck - coverage diff --git a/conda/artiq-kc705-nist_clock/build.sh b/conda/artiq-kc705-nist_clock/build.sh index 790873e12..29f6e5018 100644 --- a/conda/artiq-kc705-nist_clock/build.sh +++ b/conda/artiq-kc705-nist_clock/build.sh @@ -10,5 +10,3 @@ V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H nist_clock --toolchain vivado 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/master/bscan_spi_xc7k325t.bit diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh index 1066dcc5e..b38c6be57 100644 --- a/conda/artiq-kc705-nist_qc2/build.sh +++ b/conda/artiq-kc705-nist_qc2/build.sh @@ -10,5 +10,3 @@ V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H nist_qc2 --toolchain vivado $ 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/master/bscan_spi_xc7k325t.bit diff --git a/conda/artiq-kc705-phaser/build.sh b/conda/artiq-kc705-phaser/build.sh index c077e8bd0..6ed1841e8 100644 --- a/conda/artiq-kc705-phaser/build.sh +++ b/conda/artiq-kc705-phaser/build.sh @@ -10,5 +10,3 @@ V=1 $PYTHON -m artiq.gateware.targets.phaser --toolchain vivado $MISOC_EXTRA_VIV 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/master/bscan_spi_xc7k325t.bit diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index c6f47b3dd..149cd0f86 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -29,7 +29,7 @@ requirements: - llvmlite-artiq 0.12.0 - binutils-or1k-linux - pythonparser >=1.1 - - openocd 0.10.0+git + - openocd 0.10.0+git 2 - lit - outputcheck - scipy