Merge branch 'release-xacts'

Conflicts:
	src/htif.scala
	src/icache.scala
	src/nbdcache.scala
	src/tile.scala
This commit is contained in:
Henry Cook committed 2013-03-20 17:37:50 -07:00
commit 95f0a688e9
8 files changed
+107 -199

No files matched your search

+1 -1
View File
@@ -8,7 +8,7 @@ import Util._
class RocketIO(implicit conf: RocketConfiguration) extends Bundle
{
val host = new HTIFIO(conf.lnConf.nTiles)
val host = new HTIFIO(conf.lnConf.nClients)
val imem = new CPUFrontendIO()(conf.icache)
val vimem = new CPUFrontendIO()(conf.icache)
val dmem = new HellaCacheIO()(conf.dcache)