From 65678fb4c2d2e5acdb2c9097825517f41885bf98 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Fri, 17 Feb 2023 15:34:01 +0800 Subject: [PATCH] kasli_soc: minor cleanup --- src/gateware/kasli_soc.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gateware/kasli_soc.py b/src/gateware/kasli_soc.py index 809818e..d33e4e9 100755 --- a/src/gateware/kasli_soc.py +++ b/src/gateware/kasli_soc.py @@ -107,12 +107,12 @@ class GenericStandalone(SoCCore): fix_serdes_timing_path(platform) self.submodules.bootstrap = GTP125BootstrapClock(self.platform) - self.crg = self.ps7 # HACK for eem_7series to find the clock + self.submodules.sys_crg = zynq_clocking.SYSCRG(self.platform, self.ps7, clk_synth_se) platform.add_false_path_constraints( self.bootstrap.cd_bootstrap.clk, self.sys_crg.cd_sys.clk) self.csr_devices.append("sys_crg") - # another hack since ps7 itself does not have cd_sys anymore + self.crg = self.ps7 # HACK for eem_7series to find the clock self.crg.cd_sys = self.sys_crg.cd_sys self.rtio_channels = [] @@ -206,7 +206,6 @@ class GenericMaster(SoCCore): clk_sw=gtx0.tx_init.done) self.csr_devices.append("sys_crg") self.crg = self.ps7 # HACK for eem_7series to find the clock - # another hack since ps7 itself does not have cd_sys anymore self.crg.cd_sys = self.sys_crg.cd_sys platform.add_false_path_constraints( self.bootstrap.cd_bootstrap.clk, self.sys_crg.cd_sys.clk) @@ -319,8 +318,6 @@ class GenericSatellite(SoCCore): ident = "acpki_" + ident SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident, ps_cd_sys=False) - self.crg = self.ps7 # HACK for eem_7series to find the clock - data_pads = [platform.request("sfp", i) for i in range(4)] self.submodules.drtio_transceiver = gtx_7series.GTX( @@ -342,6 +339,7 @@ class GenericSatellite(SoCCore): platform.add_false_path_constraints( self.bootstrap.cd_bootstrap.clk, self.sys_crg.cd_sys.clk) self.csr_devices.append("sys_crg") + self.crg = self.ps7 # HACK for eem_7series to find the clock self.crg.cd_sys = self.sys_crg.cd_sys self.rtio_channels = []