M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

artiq_flash.sh: improve detection of flash proxy location 

Flash proxy is now searched in ~/.migen /usr/local/share/migen
/usr/share/migen and in the directory specified by "-d" argument
or in artiq/binaries/<board_name>/ if "-d" is not specified.
This commit is contained in:
Yann Sionneau 2015-04-16 16:45:45 +02:00 committed by Sebastien Bourdeauducq
parent 6a5f58e5a9
commit 52fe66ee4d
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
artiq/frontend/artiq_flash.sh
View File

@ -59,6 +59,30 @@ do
esac esac
done done
function search_for_proxy()
{
PROXY=$1 # The proxy name
if [ -f $HOME/.migen/$PROXY ]
then
PROXY_PATH=$HOME/.migen/
elif [ -f /usr/local/share/migen/$PROXY ]
then
PROXY_PATH=/usr/local/share/migen/
elif [ -f /usr/share/migen/$PROXY ]
then
PROXY_PATH=/usr/share/migen/
elif [ -f $BIN_PREFIX/$PROXY ]
then
PROXY_PATH=$BIN_PREFIX
else
echo "$BOARD flash proxy ($PROXY) not found."
echo "Please put it in ~/.migen or /usr/local/share/migen or /usr/share/migen"
echo "To get the flash proxy, follow the \"Install the required flash proxy bitstreams:\""
echo "bullet point from http://m-labs.hk/artiq/manual/installing.html#preparing-the-core-device-fpga-board"
exit 1
fi
}
if ! [ -z "$BIN_PATH" ] if ! [ -z "$BIN_PATH" ]
then then
BIN_PREFIX=$BIN_PATH BIN_PREFIX=$BIN_PATH
@ -70,44 +94,30 @@ then
BITSTREAM=artiq_ppro-up-papilio_pro.bin BITSTREAM=artiq_ppro-up-papilio_pro.bin
CABLE=papilio CABLE=papilio
PROXY=bscan_spi_lx9_papilio.bit PROXY=bscan_spi_lx9_papilio.bit
BIN_PREFIX=$ARTIQ_PREFIX/binaries/ppro
PROXY_PATH=$BIN_PREFIX
BIOS_ADDR=0x60000 BIOS_ADDR=0x60000
RUNTIME_ADDR=0x70000 RUNTIME_ADDR=0x70000
if [ -z "$BIN_PREFIX" ]; then BIN_PREFIX=$ARTIQ_PREFIX/binaries/ppro; fi
search_for_proxy $PROXY
elif [ "$BOARD" == "pipistrello" ] elif [ "$BOARD" == "pipistrello" ]
then then
UDEV_RULES=99-ppro.rules UDEV_RULES=99-ppro.rules
BITSTREAM=artiq_pipistrello-amp-pipistrello.bin BITSTREAM=artiq_pipistrello-amp-pipistrello.bin
CABLE=papilio CABLE=papilio
PROXY=bscan_spi_lx9_csg324.bit PROXY=bscan_spi_lx9_csg324.bit
BIN_PREFIX=$ARTIQ_PREFIX/binaries/pipistrello
PROXY_PATH=$BIN_PREFIX
BIOS_ADDR=0x170000 BIOS_ADDR=0x170000
RUNTIME_ADDR=0x180000 RUNTIME_ADDR=0x180000
if [ -z "$BIN_PREFIX" ]; then BIN_PREFIX=$ARTIQ_PREFIX/binaries/pipistrello; fi
search_for_proxy $PROXY
elif [ "$BOARD" == "kc705" ] elif [ "$BOARD" == "kc705" ]
then then
UDEV_RULES=99-kc705.rules UDEV_RULES=99-kc705.rules
BITSTREAM=artiq_kc705-artiqsocbasic-kc705.bit BITSTREAM=artiq_kc705-artiqsocbasic-kc705.bit
CABLE=jtaghs1_fast CABLE=jtaghs1_fast
PROXY=bscan_spi_kc705.bit PROXY=bscan_spi_kc705.bit
BIN_PREFIX=$ARTIQ_PREFIX/binaries/kc705
BIOS_ADDR=0xaf0000 BIOS_ADDR=0xaf0000
RUNTIME_ADDR=0xb00000 RUNTIME_ADDR=0xb00000
if [ -f $HOME/.migen/$PROXY ] if [ -z "$BIN_PREFIX" ]; then BIN_PREFIX=$ARTIQ_PREFIX/binaries/kc705; fi
then search_for_proxy $PROXY
PROXY_PATH=$HOME/.migen/
elif [ -f /usr/local/share/migen/$PROXY ]
then
PROXY_PATH=/usr/local/share/migen/
elif [ -f /usr/share/migen/$PROXY ]
then
PROXY_PATH=/usr/share/migen/
else
echo "KC705 flash proxy ($PROXY) not found."
echo "Please build it from https://github.com/m-labs/bscan_spi_kc705"
echo "and put it in ~/.migen or /usr/local/share/migen or /usr/share/migen"
exit 1
fi
fi fi
# Check if neither of -b|-B|-r have been used # Check if neither of -b|-B|-r have been used