From 8e0831b348b075d648aa03dc3c12bd59635aa490 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Fri, 31 Jan 2025 14:11:37 +0100
Subject: [PATCH] fpga: Remove vivado_lab support

Previously, the build tools for the FPGA bitfiles would try and
autodetect the Vivado executable, but would allow for a `vivado_lab`
executable. However, Vivado Lab Edition can't build bitfiles nor run
testbenches. Its only use with the USRP FPGA build tooling is to run
`viv_jtag_program` and `viv_jtag_list` (which are command-line proxies
for probing FPGAs attached to JTAG, and for programming bitfiles over
JTAG, e.g. to an X3x0).

When Vivado Lab and Vivado were present, it was possible that we ran
into issues where Vivado Labs would be preferred, and then builds or
testbenches would fail.

We therefore remove the ability to use Vivado Lab. Running the Vivado
Lab Edition with the GUI, and loading and probing bitfiles is of course
still possible, but tools like `rfnoc_image_builder` can no longer
accidentally try to use Vivado Lab instead of regular Vivado.


Original-commit: 21c4c591a51d520c7aac7108e853e59c4953f953
---
 tools/scripts/launch_vivado.py | 2 --
 tools/scripts/launch_vivado.sh | 3 ---
 tools/scripts/setupenv_base.sh | 6 +-----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/tools/scripts/launch_vivado.py b/tools/scripts/launch_vivado.py
index c1af934..f3f0297 100755
--- a/tools/scripts/launch_vivado.py
+++ b/tools/scripts/launch_vivado.py
@@ -442,8 +442,6 @@ def main():
     if args.vivado_command is None:
         if which("vivado"):
             args.vivado_command = "vivado"
-        elif which("vivado_lab"):
-            args.vivado_command = "vivado_lab"
         else:
             print("Cannot find Vivado executable!")
             return False
diff --git a/tools/scripts/launch_vivado.sh b/tools/scripts/launch_vivado.sh
index a0cce6e..be71cbe 100755
--- a/tools/scripts/launch_vivado.sh
+++ b/tools/scripts/launch_vivado.sh
@@ -63,9 +63,6 @@ trim() {
 }
 
 VIVADO_COMMAND="vivado"
-if command -v vivado_lab >/dev/null 2>&1; then
-    VIVADO_COMMAND=vivado_lab
-fi
 
 $VIVADO_COMMAND $viv_args 2>&1 | while IFS= read -r line
 
diff --git a/tools/scripts/setupenv_base.sh b/tools/scripts/setupenv_base.sh
index 2f3c732..ae66915 100644
--- a/tools/scripts/setupenv_base.sh
+++ b/tools/scripts/setupenv_base.sh
@@ -190,11 +190,7 @@ else
 fi
 
 $VIVADO_PATH/settings${BITNESS}.sh
-if [[ -e $VIVADO_PATH/.settings${BITNESS}-Vivado_Lab.sh ]]; then
-    $VIVADO_PATH/.settings${BITNESS}-Vivado_Lab.sh
-else
-    $VIVADO_PATH/.settings${BITNESS}-Vivado.sh
-fi
+$VIVADO_PATH/.settings${BITNESS}-Vivado.sh
 if [[ -e $(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh ]]; then
     $(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh
 fi