diff options
| author | Clifford Wolf <clifford@clifford.at> | 2017-07-31 15:56:25 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2017-07-31 15:56:25 +0200 |
| commit | ea0e19f3d33eedc63b564a99267dfbb85e428375 (patch) | |
| tree | fe7b42cb865d8deef2b457c70f05c79cd11d24ee /icefuzz | |
| parent | 72d2a0281073c64883510d06dcc5a025f973fbdd (diff) | |
| download | icestorm-ea0e19f3d33eedc63b564a99267dfbb85e428375.tar.gz icestorm-ea0e19f3d33eedc63b564a99267dfbb85e428375.tar.bz2 icestorm-ea0e19f3d33eedc63b564a99267dfbb85e428375.zip | |
Fix icecube.sh to work with lin and lin64 dirs, remove hardcoded ICECUBEDIR=
Diffstat (limited to 'icefuzz')
| -rw-r--r-- | icefuzz/icecube.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/icefuzz/icecube.sh b/icefuzz/icecube.sh index 18422c3..422ded6 100644 --- a/icefuzz/icecube.sh +++ b/icefuzz/icecube.sh @@ -56,11 +56,10 @@ if [ "$1" == "-up5k" ]; then shift fi -ICECUBEDIR=~/lscc/iCEcube2.2017.01 - set -ex set -- ${1%.v} icecubedir="${ICECUBEDIR:-/opt/lscc/iCEcube2.2015.08}" +if [ -d $icecubedir/LSE/bin/lin64 ]; then lin_lin64=lin64; else lin_lin64=lin; fi export FOUNDRY="$icecubedir/LSE" export SBT_DIR="$icecubedir/sbt_backend" export SYNPLIFY_PATH="$icecubedir/synpbase" @@ -69,7 +68,7 @@ export TCL_LIBRARY="$icecubedir/sbt_backend/bin/linux/lib/tcl8.4" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$icecubedir/sbt_backend/bin/linux/opt" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$icecubedir/sbt_backend/bin/linux/opt/synpwrap" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$icecubedir/sbt_backend/lib/linux/opt" -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$icecubedir/LSE/bin/lin64" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$icecubedir/LSE/bin/${lin_lin64}" case "${ICEDEV:-hx1k-tq144}" in hx1k-cb132) @@ -350,7 +349,7 @@ fi # synthesis (Lattice LSE) if true; then - "$icecubedir"/LSE/bin/lin64/synthesis -f "impl_lse.prj" + "$icecubedir"/LSE/bin/${lin_lin64}/synthesis -f "impl_lse.prj" fi # convert netlist @@ -419,4 +418,5 @@ if [ -n "$ICE_SBTIMER_LP" ]; then fi export LD_LIBRARY_PATH="" -$scriptdir/../icepack/iceunpack -vv "$1.bin" "$1.asc" +$scriptdir/../icepack/iceunpack "$1.bin" "$1.asc" + |