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