Merge remote-tracking branch 'origin/dev' into diplomatic-clocks-pll-redux

2020-09-25 10:52:33 -07:00
parent 67145c6ccd 023d8096a9
commit b76972d34b
20 changed files with 218 additions and 333 deletions
--- a/generators/firechip/src/main/scala/BridgeBinders.scala
+++ b/generators/firechip/src/main/scala/BridgeBinders.scala
@@ -66,9 +66,10 @@ class WithFireSimIOCellModels extends Config((site, here, up) => {
 })

 class WithSerialBridge extends OverrideHarnessBinder({
-  (system: CanHavePeripherySerial, th: HasHarnessSignalReferences, ports: Seq[ClockedIO[SerialIO]]) => {
+  (system: CanHavePeripheryTLSerial, th: HasHarnessSignalReferences, ports: Seq[ClockedIO[SerialIO]]) => {
    ports.map { p =>
-      SerialBridge(p.clock, p.bits, MainMemoryConsts.globalName)(GetSystemParameters(system))
+      val ram = SerialAdapter.connectHarnessRAM(system.serdesser.get, p, th.harnessReset)
+      SerialBridge(p.clock, ram.module.io.tsi_ser, MainMemoryConsts.globalName)(GetSystemParameters(system))
    }
    Nil
  }