clock resolution
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Mon, 30 Jul 2018 05:53:09 +0000 (06:53 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Mon, 30 Jul 2018 05:53:09 +0000 (06:53 +0100)
src/bsv/bsv_lib/soc_template.bsv
src/bsv/peripheral_gen/base.py
src/bsv/peripheral_gen/rgbttl.py

index 01a05d35ea94dfbb331dcc97943c54410cb372cf..da213b72811e68ca6864fb664df34954f560e2ff 100644 (file)
@@ -40,6 +40,7 @@ package socgen;
     import Clocks::*;
 
     /*=== Project imports === */
+    import ifc_sync:: *;
     import ConcatReg::*;
     import AXI4_Types::*;
     import AXI4_Fabric::*;
index 92c41d687bd8aae6429c0392a106b9a30cb9b24d..7b8ca982095b0ba526c929c007f9d51521df5ff9 100644 (file)
@@ -235,7 +235,8 @@ else"""
         if ctype == 'slow':
             spc = "sp_clock, sp_reset"
         else:
-            spc = "fast_clock, fast_reset"
+            spc = ck
+            ck = "core_clock, core_reset"
         template = """\
 Ifc_sync#({0}) {1}_sync <-mksyncconnection(
             {2}, {3});"""
index ad1027eaeed420cae065b1b6d4c26e7b6feba5dd..91f2eb9be9a014ed28df1af86044e087ab006d7f 100644 (file)
@@ -35,8 +35,7 @@ class rgbttl(PBase):
         else:
             sname = self.peripheral.iname().format(count)
             ps = "pinmux.peripheral_side.%s" % sname
-        name = self.get_iname(count)
-        n = "{0}".format(name)
+        n = self.get_iname(count)
         for ptype in ['data_out']:
             ps_ = "{0}.{1}".format(ps, ptype)
             ret += self._mk_actual_connection('out', name, count, 'out',
@@ -51,7 +50,8 @@ class rgbttl(PBase):
         if ctype == 'slow':
             spc = "sp_clock, sp_reset"
         else:
-            spc = "fast_clock, fast_reset"
+            spc = ck
+            ck = "core_clock, core_reset"
         template = """\
 Ifc_sync#({0}) {1}_sync <-mksyncconnection(
             {2}, {3});"""