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
This commit is contained in:
Martin Braun
2025-02-06 16:45:15 +01:00
committed by Jörg Hofrichter
parent b016b90dbc
commit 8e0831b348
3 changed files with 1 additions and 10 deletions
-2
View File
@@ -442,8 +442,6 @@ def main():
if args.vivado_command is None: if args.vivado_command is None:
if which("vivado"): if which("vivado"):
args.vivado_command = "vivado" args.vivado_command = "vivado"
elif which("vivado_lab"):
args.vivado_command = "vivado_lab"
else: else:
print("Cannot find Vivado executable!") print("Cannot find Vivado executable!")
return False return False
-3
View File
@@ -63,9 +63,6 @@ trim() {
} }
VIVADO_COMMAND="vivado" 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 $VIVADO_COMMAND $viv_args 2>&1 | while IFS= read -r line
+1 -5
View File
@@ -190,11 +190,7 @@ else
fi fi
$VIVADO_PATH/settings${BITNESS}.sh $VIVADO_PATH/settings${BITNESS}.sh
if [[ -e $VIVADO_PATH/.settings${BITNESS}-Vivado_Lab.sh ]]; then $VIVADO_PATH/.settings${BITNESS}-Vivado.sh
$VIVADO_PATH/.settings${BITNESS}-Vivado_Lab.sh
else
$VIVADO_PATH/.settings${BITNESS}-Vivado.sh
fi
if [[ -e $(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh ]]; then if [[ -e $(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh ]]; then
$(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh $(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh
fi fi