1
0

Merge branch 'master' into test-harness-fixes

This commit is contained in:
Andrew Waterman 2016-08-19 22:53:12 -07:00 committed by GitHub
commit b7181ba49b

View File

@ -193,7 +193,9 @@ class DefaultOuterMemorySystem(implicit p: Parameters) extends OuterMemorySystem
case InnerTLId => "L1toL2" case InnerTLId => "L1toL2"
case OuterTLId => "L2toMMIO" case OuterTLId => "L2toMMIO"
}))) })))
io.mmio <> mmioManager.io.outer
io.mmio.acquire <> Queue(mmioManager.io.outer.acquire, 1)
mmioManager.io.outer.grant <> Queue(io.mmio.grant, 1)
// Wire the tiles to the TileLink client ports of the L1toL2 network, // Wire the tiles to the TileLink client ports of the L1toL2 network,
// and coherence manager(s) to the other side // and coherence manager(s) to the other side