From 6dad16ccab36984dac9303603a19ce183520d871 Mon Sep 17 00:00:00 2001
From: Wade Fife <wade.fife@ettus.com>
Date: Tue, 6 Sep 2022 16:10:18 -0500
Subject: [PATCH] fpga: Fix Vivado version check in viv_hardware_utils

Original-commit: b5f324f1df7ac3a30c7669efa73e58aaf02e1f78
---
 tools/scripts/viv_hardware_utils.tcl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/scripts/viv_hardware_utils.tcl b/tools/scripts/viv_hardware_utils.tcl
index 2bdc02e..455fb77 100644
--- a/tools/scripts/viv_hardware_utils.tcl
+++ b/tools/scripts/viv_hardware_utils.tcl
@@ -68,8 +68,12 @@ proc ::jtag_program { filepath {serial "."} {address "0:0"} } {
     }
 }
 
+# Work around Vivado 2021.1 bug where patches aren't included in Vivado version
+# string check. See AR 76681.
+set_param labtools.override_cs_server_version_check 1
+
 # Initialization sequence
-open_hw
+open_hw_manager
 connect_server
 
 if [expr $argc > 0] {