bump rocket-chip for flattened coreplex/system

This commit is contained in:
Howard Mao
2017-08-04 01:15:46 +00:00
parent cb79078641
commit 506afbb363
5 changed files with 16 additions and 21 deletions

View File

@@ -1,9 +1,8 @@
package example
import chisel3._
import freechips.rocketchip.chip._
import freechips.rocketchip.config.{Parameters, Config}
import freechips.rocketchip.coreplex.WithRoccExample
import freechips.rocketchip.coreplex.{WithRoccExample, WithNMemoryChannels}
import freechips.rocketchip.diplomacy.LazyModule
import testchipip._
@@ -34,7 +33,7 @@ class WithSimBlockDevice extends Config((site, here, up) => {
})
class BaseExampleConfig extends Config(
new freechips.rocketchip.chip.DefaultConfig)
new freechips.rocketchip.system.DefaultConfig)
class DefaultExampleConfig extends Config(
new WithExampleTop ++ new BaseExampleConfig)

View File

@@ -2,8 +2,8 @@ package example
import chisel3._
import chisel3.util._
import freechips.rocketchip.coreplex.HasPeripheryBus
import freechips.rocketchip.config.{Parameters, Field}
import freechips.rocketchip.chip._
import freechips.rocketchip.diplomacy._
import freechips.rocketchip.regmapper.{HasRegMap, RegField}
import freechips.rocketchip.tilelink._
@@ -74,16 +74,15 @@ class PWMTL(c: PWMParams)(implicit p: Parameters)
new TLRegBundle(c, _) with PWMTLBundle)(
new TLRegModule(c, _, _) with PWMTLModule)
trait HasPeripheryPWM extends HasSystemNetworks {
trait HasPeripheryPWM extends HasPeripheryBus {
implicit val p: Parameters
private val address = 0x2000
val pwm = LazyModule(new PWMTL(
PWMParams(address, peripheryBusConfig.beatBytes))(p))
PWMParams(address, pbus.beatBytes))(p))
pwm.node := TLFragmenter(
peripheryBusConfig.beatBytes, cacheBlockBytes)(peripheryBus.node)
pwm.node := pbus.toVariableWidthSlaves
}
trait HasPeripheryPWMModuleImp extends LazyMultiIOModuleImp {

View File

@@ -1,27 +1,24 @@
package example
import chisel3._
import freechips.rocketchip.coreplex._
import freechips.rocketchip.config.Parameters
import freechips.rocketchip.chip._
import freechips.rocketchip.devices.tilelink._
import testchipip._
class ExampleTop(implicit p: Parameters) extends BaseSystem
with HasPeripheryMasterAXI4MemPort
with HasPeripheryErrorSlave
with HasPeripheryZeroSlave
class ExampleTop(implicit p: Parameters) extends RocketCoreplex
with HasMasterAXI4MemPort
with HasPeripheryBootROM
with HasPeripheryRTCCounter
with HasRocketPlexMaster
with HasPeripheryErrorSlave
with HasNoDebug
with HasPeripherySerial {
override lazy val module = new ExampleTopModule(this)
}
class ExampleTopModule[+L <: ExampleTop](l: L) extends BaseSystemModule(l)
with HasPeripheryMasterAXI4MemPortModuleImp
class ExampleTopModule[+L <: ExampleTop](l: L) extends RocketCoreplexModule(l)
with HasRTCModuleImp
with HasMasterAXI4MemPortModuleImp
with HasPeripheryBootROMModuleImp
with HasPeripheryRTCCounterModuleImp
with HasRocketPlexMasterModuleImp
with HasNoDebugModuleImp
with HasPeripherySerialModuleImp