From d4747a85f3e59feb63f4decc66c51deab8e0204f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 4 Nov 2015 18:36:34 +0800 Subject: [PATCH] conda: use vivado for kc705 builds --- conda/artiq-kc705-nist_qc1/build.sh | 2 +- conda/artiq-kc705-nist_qc2/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/artiq-kc705-nist_qc1/build.sh b/conda/artiq-kc705-nist_qc1/build.sh index 03bcadd9a..c0f1c9de9 100644 --- a/conda/artiq-kc705-nist_qc1/build.sh +++ b/conda/artiq-kc705-nist_qc1/build.sh @@ -6,7 +6,7 @@ BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc1 mkdir -p $SOC_PREFIX -$PYTHON -m artiq.gateware.targets.kc705 -H qc1 $MISOC_EXTRA_ISE_CMDLINE +$PYTHON -m artiq.gateware.targets.kc705 -H qc1 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE 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 diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh index 38cac5ab7..c9094cc96 100644 --- a/conda/artiq-kc705-nist_qc2/build.sh +++ b/conda/artiq-kc705-nist_qc2/build.sh @@ -6,7 +6,7 @@ BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc2 mkdir -p $SOC_PREFIX -$PYTHON -m artiq.gateware.targets.kc705 -H qc2 $MISOC_EXTRA_ISE_CMDLINE +$PYTHON -m artiq.gateware.targets.kc705 -H qc2 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE 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