From 34771ade67c085afc50e101c5b3cb5bee3fca0dd Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Sat, 22 Aug 2015 15:28:32 +0200
Subject: [PATCH] artiq_flash.sh: fix runtime programming and allow usage of -d
 . -r

---
 artiq/frontend/artiq_flash.sh | 6 +++---
 conda/artiq/build.sh          | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/artiq/frontend/artiq_flash.sh b/artiq/frontend/artiq_flash.sh
index a008b2ebd..4d155e4b9 100755
--- a/artiq/frontend/artiq_flash.sh
+++ b/artiq/frontend/artiq_flash.sh
@@ -123,7 +123,7 @@ then
 	PROXY=bscan_spi_kc705.bit
 	BIOS_ADDR=0xaf0000
 	RUNTIME_ADDR=0xb00000
-	RUNTIME_FILENAME=runtime_${MEZZANINE_BOARD}.fbi
+	RUNTIME_FILE=${MEZZANINE_BOARD}/runtime.fbi
 	FS_ADDR=0xb40000
 	if [ -z "$BIN_PREFIX" ]; then BIN_PREFIX=$ARTIQ_PREFIX/binaries/kc705; fi
 	search_for_proxy $PROXY
@@ -135,7 +135,7 @@ then
 	PROXY=bscan_spi_lx45_csg324.bit
 	BIOS_ADDR=0x170000
 	RUNTIME_ADDR=0x180000
-	RUNTIME_FILENAME=runtime.fbi
+	RUNTIME_FILE=runtime.fbi
 	FS_ADDR=0x1c0000
 	if [ -z "$BIN_PREFIX" ]; then BIN_PREFIX=$ARTIQ_PREFIX/binaries/pipistrello; fi
 	search_for_proxy $PROXY
@@ -185,7 +185,7 @@ fi
 if [ "${FLASH_RUNTIME}" == "1" ]
 then
 	echo "Flashing ARTIQ runtime..."
-	xc3sprog -v -c $CABLE -I$PROXY_PATH/$PROXY $BIN_PREFIX/runtime.fbi:w:$RUNTIME_ADDR:BIN
+	xc3sprog -v -c $CABLE -I$PROXY_PATH/$PROXY $BIN_PREFIX/${RUNTIME_FILE}:w:$RUNTIME_ADDR:BIN
 fi
 echo "Done."
 xc3sprog -v -c $CABLE -R > /dev/null 2>&1
diff --git a/conda/artiq/build.sh b/conda/artiq/build.sh
index 0f30a2453..0a6dd1225 100755
--- a/conda/artiq/build.sh
+++ b/conda/artiq/build.sh
@@ -24,7 +24,8 @@ cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_kc705 $MISOC_EXTRA_VIVADO_
 
 # install KC705 NIST_QC1 binaries
 
-cp soc/runtime/runtime.fbi $BIN_PREFIX/kc705/runtime_nist_qc1.fbi
+mkdir -p $BIN_PREFIX/kc705/nist_qc1
+cp soc/runtime/runtime.fbi $BIN_PREFIX/kc705/nist_qc1/
 cp $SRC_DIR/misoc/software/bios/bios.bin $BIN_PREFIX/kc705/
 cp $SRC_DIR/misoc/build/artiq_kc705-nist_qc1-kc705.bit $BIN_PREFIX/kc705/
 wget http://sionneau.net/artiq/binaries/kc705/flash_proxy/bscan_spi_kc705.bit
@@ -52,7 +53,8 @@ cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_kc705 -s NIST_QC2 $MISOC_E
 
 # install KC705 NIST_QC2 binaries
 
-cp soc/runtime/runtime.fbi $BIN_PREFIX/kc705/runtime_nist_qc2.fbi
+mkdir -p $BIN_PREFIX/kc705/nist_qc2
+cp soc/runtime/runtime.fbi $BIN_PREFIX/kc705/nist_qc2/
 cp $SRC_DIR/misoc/build/artiq_kc705-nist_qc2-kc705.bit $BIN_PREFIX/kc705/
 
 cp artiq/frontend/artiq_flash.sh $PREFIX/bin