srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of github.com:m-labs/artiq

This commit is contained in:
Sebastien Bourdeauducq 2015-05-17 16:11:16 +08:00
parent b74b8d5826 e9b166b199
commit d8917fd94f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/frontend/artiq_flash.sh
View File

@ -117,11 +117,7 @@ then
FLASH_BITSTREAM=1 FLASH_BITSTREAM=1
fi fi
check_return() { set +e
echo "Flashing failed, you may want to re-run the flashing tool."
exit
}
xc3sprog -c $CABLE -R > /dev/null 2>&1 xc3sprog -c $CABLE -R > /dev/null 2>&1
if [ "$?" != "0" ] if [ "$?" != "0" ]
then then
@ -129,10 +125,12 @@ then
echo "To fix this you might want to add a udev rule by doing:" echo "To fix this you might want to add a udev rule by doing:"
echo "$ sudo cp $ARTIQ_PREFIX/misc/$UDEV_RULES /etc/udev/rules.d" echo "$ sudo cp $ARTIQ_PREFIX/misc/$UDEV_RULES /etc/udev/rules.d"
echo "Then unplug/replug your device and try flashing again" echo "Then unplug/replug your device and try flashing again"
echo
echo "Other reason could be that you chosed the wrong target"
echo "Please make sure you used the correct -t option (currently: $BOARD)"
exit exit
fi fi
set -e
trap check_return ERR
if [ "${FLASH_BITSTREAM}" == "1" ] if [ "${FLASH_BITSTREAM}" == "1" ]
then then