Merge remote-tracking branch 'refs/remotes/origin/gtrxaligncheck-dev'…

… into gtrxaligncheck-dev
slaclab · Oct 8, 2024 · 72c7bf1 · 72c7bf1
2 parents b6362ae + 56dd7ae
commit 72c7bf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/LCLS-II/gthUltraScale+/ruckus.tcl b/LCLS-II/gthUltraScale+/ruckus.tcl
@@ -4,7 +4,7 @@ source -quiet $::env(RUCKUS_DIR)/vivado_proc.tcl
 if { $::env(VIVADO_VERSION) >= 2022.2} {
    loadSource -lib lcls_timing_core -dir "$::DIR_PATH/rtl"
 
-   if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+   if { [info exists ::env(LCLS_TIMING_GTH_XCI)] != 0 && $::env(LCLS_TIMING_GTH_XCI) == 1 } {
        loadIpCore -path "$::DIR_PATH/coregen/TimingGth_extref.xci"
        loadIpCore -path "$::DIR_PATH/coregen/TimingGth_fixedlat.xci"
    } else {

diff --git a/LCLS-II/gthUltraScale/ruckus.tcl b/LCLS-II/gthUltraScale/ruckus.tcl
@@ -5,7 +5,7 @@ if { $::env(VIVADO_VERSION) >= 2016.4 } {
 
    loadSource -lib lcls_timing_core -dir "$::DIR_PATH/rtl"
 
-   if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+   if { [info exists ::env(LCLS_TIMING_GTH_XCI)] != 0 && $::env(LCLS_TIMING_GTH_XCI) == 1 } {
        loadIpCore -path "$::DIR_PATH/coregen/TimingGth_extref.xci"
        loadIpCore -path "$::DIR_PATH/coregen/TimingGth_fixedlat.xci"
    } else {

diff --git a/LCLS-II/gtyUltraScale+/ruckus.tcl b/LCLS-II/gtyUltraScale+/ruckus.tcl
@@ -14,7 +14,7 @@ if { [info exists ::env(TIMING_246MHz)] != 1 || $::env(TIMING_246MHz) == 0 } {
 
 if { $::env(VIVADO_VERSION) >= 2021.1 && [info exists ::env(TIMING_246MHz)] != 1} {
 
-   if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+   if { [info exists ::env(LCLS_TIMING_GTY_XCI)] != 0 && $::env(LCLS_TIMING_GTY_XCI) == 1 } {
        loadIpCore -path "${path}/TimingGty_extref.xci"
        loadIpCore -path "${path}/TimingGty_fixedlat.xci"
        puts "Loading XCI files for LCLS Timing"
@@ -26,7 +26,7 @@ if { $::env(VIVADO_VERSION) >= 2021.1 && [info exists ::env(TIMING_246MHz)] != 1
 
 } elseif { $::env(VIVADO_VERSION) >= 2020.2 && [info exists ::env(TIMING_246MHz)] == 1 } {
 
-    if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+    if { [info exists ::env(LCLS_TIMING_GTY_XCI)] != 0 && $::env(LCLS_TIMING_GTY_XCI) == 1 } {
 	loadIpCore -path "${path}/TimingGty_extref.xci"
 	loadIpCore -path "${path}/TimingGty_fixedlat.xci"       
     } else {