1
0

Merge branch 'release-xacts'

Conflicts:
	src/htif.scala
	src/icache.scala
	src/nbdcache.scala
	src/tile.scala
This commit is contained in:
Henry Cook
2013-03-20 17:37:50 -07:00
8 changed files with 107 additions and 199 deletions

View File

@ -104,7 +104,7 @@ object PCR
class PCR(implicit conf: RocketConfiguration) extends Component
{
val io = new Bundle {
val host = new HTIFIO(conf.lnConf.nTiles)
val host = new HTIFIO(conf.lnConf.nClients)
val r = new ioReadPort(conf.nxpr, conf.xprlen)
val w = new ioWritePort(conf.nxpr, conf.xprlen)