From 156d714b8fb288100d242ea200ae1d1dcd6bcd57 Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Wed, 25 Mar 2020 11:59:25 -0500 Subject: 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. --- fpga/usrp3/tools/scripts/setupenv_base.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'fpga/usrp3/tools/scripts') 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" -- cgit v1.2.3