diff options
| author | Wade Fife <wade.fife@ettus.com> | 2020-03-25 11:59:25 -0500 |
|---|---|---|
| committer | Wade Fife <wade.fife@ettus.com> | 2020-04-01 08:45:41 -0500 |
| commit | 156d714b8fb288100d242ea200ae1d1dcd6bcd57 (patch) | |
| tree | 530a431972465fee400637b309a665f505c843de | |
| parent | 52f1c15cfc99fda3dfd1d249d37b5a99b06eac95 (diff) | |
| download | uhd-156d714b8fb288100d242ea200ae1d1dcd6bcd57.tar.gz uhd-156d714b8fb288100d242ea200ae1d1dcd6bcd57.tar.bz2 uhd-156d714b8fb288100d242ea200ae1d1dcd6bcd57.zip | |
fpga: tools: Add default Vivado install location
Xilinx changed the default Vivado install location from /opt/Xilix to
/tools/Xilinx. This commit adds support for finding Vivado in either
the new location or the old location.
| -rw-r--r-- | fpga/usrp3/tools/scripts/setupenv_base.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fpga/usrp3/tools/scripts/setupenv_base.sh b/fpga/usrp3/tools/scripts/setupenv_base.sh index 0cdf71370..d401b410e 100644 --- a/fpga/usrp3/tools/scripts/setupenv_base.sh +++ b/fpga/usrp3/tools/scripts/setupenv_base.sh @@ -17,7 +17,11 @@ if [[ $VIV_PLATFORM = "Cygwin" ]]; then fi MODELSIM_BASE_PATH="/cygdrive/c/mentor/modelsim" else - if [[ -d "/opt/Xilinx/Vivado_Lab" ]]; then + if [[ -d "/tools/Xilinx/Vivado_Lab" ]]; then + VIVADO_BASE_PATH="/tools/Xilinx/Vivado_Lab" + elif [[ -d "/tools/Xilinx/Vivado" ]]; then + VIVADO_BASE_PATH="/tools/Xilinx/Vivado" + elif [[ -d "/opt/Xilinx/Vivado_Lab" ]]; then VIVADO_BASE_PATH="/opt/Xilinx/Vivado_Lab" else VIVADO_BASE_PATH="/opt/Xilinx/Vivado" |