bug fix to prevent locked up gtRxClk/gtRxRst

slaclab · Jan 5, 2024 · d95cd84 · d95cd84
1 parent cddedd4
commit d95cd84
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/firmware/python/cameralink_gateway/_ClinkDevRoot.py b/firmware/python/cameralink_gateway/_ClinkDevRoot.py
@@ -58,7 +58,7 @@ def __init__(self,
         self.FebVersionLock = 0x08020000
 
         # Set the FEB firmware Version lock = https://github.com/slaclab/lcls2-pgp-pcie-apps/blob/master/firmware/targets/shared_config.mk
-        self.PcieVersionLock = 0x03050000
+        self.PcieVersionLock = 0x03060000
 
         # Set local variables
         self.laneConfig     = laneConfig

diff --git a/firmware/submodules/l2si-core b/firmware/submodules/l2si-core
diff --git a/firmware/submodules/lcls-timing-core b/firmware/submodules/lcls-timing-core
diff --git a/firmware/submodules/lcls2-pgp-fw-lib b/firmware/submodules/lcls2-pgp-fw-lib
+1 −1		base/rtl/TriggerEventBuffer.vhd
+4 −4		xpm/rtl/XpmApp.vhd
+1 −1		xpm/rtl/XpmSeqMemReg.vhd
+5 −5		xpm/rtl/XpmSeqPkg.vhd
+7 −7		xpm/rtl/XpmSeqXbar.vhd
+27 −2		shared/rtl/UltraScale+/TimingRx.vhd
+27 −2		shared/rtl/UltraScale/TimingRx.vhd