conda/artiq_flash: use proxy bitstream package

fix #841
This commit is contained in:
Robert Jördens 2017-10-23 15:21:51 +02:00
parent 22d5859876
commit 7edff48b6d
6 changed files with 11 additions and 9 deletions

View File

@ -58,6 +58,14 @@ def scripts_path():
return p 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: class Programmer:
def __init__(self, target_file): def __init__(self, target_file):
self.target_file = target_file self.target_file = target_file
@ -218,7 +226,7 @@ def main():
for action in opts.action: for action in opts.action:
if action == "proxy": if action == "proxy":
proxy_found = False 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"]: "/usr/local/share/migen", "/usr/share/migen"]:
proxy_bitfile = os.path.join(p, config["proxy_bitfile"]) proxy_bitfile = os.path.join(p, config["proxy_bitfile"])
if os.access(proxy_bitfile, os.R_OK): if os.access(proxy_bitfile, os.R_OK):

View File

@ -22,7 +22,7 @@ requirements:
- llvmlite-artiq 0.12.0 - llvmlite-artiq 0.12.0
- rust-core-or1k 1.20.0 16 - rust-core-or1k 1.20.0 16
- cargo 0.11.0 - cargo 0.11.0
- openocd 0.10.0+git - openocd 0.10.0+git 2
- lit - lit
- outputcheck - outputcheck
- coverage - coverage

View File

@ -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/gateware/top.bit $SOC_PREFIX
cp misoc_nist_clock_kc705/software/bios/bios.bin $SOC_PREFIX cp misoc_nist_clock_kc705/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_clock_kc705/software/runtime/runtime.fbi $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

View File

@ -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/gateware/top.bit $SOC_PREFIX
cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_qc2_kc705/software/runtime/runtime.fbi $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

View File

@ -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/gateware/top.bit $SOC_PREFIX
cp misoc_phaser_kc705/software/bios/bios.bin $SOC_PREFIX cp misoc_phaser_kc705/software/bios/bios.bin $SOC_PREFIX
cp misoc_phaser_kc705/software/runtime/runtime.fbi $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

View File

@ -29,7 +29,7 @@ requirements:
- llvmlite-artiq 0.12.0 - llvmlite-artiq 0.12.0
- binutils-or1k-linux - binutils-or1k-linux
- pythonparser >=1.1 - pythonparser >=1.1
- openocd 0.10.0+git - openocd 0.10.0+git 2
- lit - lit
- outputcheck - outputcheck
- scipy - scipy