diff --git a/src/main/scala/uncore/Builder.scala b/src/main/scala/uncore/Builder.scala index a75f5688..624120e4 100644 --- a/src/main/scala/uncore/Builder.scala +++ b/src/main/scala/uncore/Builder.scala @@ -22,7 +22,7 @@ object UncoreBuilder extends App { val gen = () => Class.forName(s"uncore.$topModuleName") - .getConstructor(classOf[cde.Parameters]) + .getConstructor(classOf[Parameters]) .newInstance(paramsFromConfig) .asInstanceOf[Module] diff --git a/src/main/scala/uncore/devices/Debug.scala b/src/main/scala/uncore/devices/Debug.scala index 6b1eec0f..ea2662e2 100644 --- a/src/main/scala/uncore/devices/Debug.scala +++ b/src/main/scala/uncore/devices/Debug.scala @@ -301,12 +301,12 @@ class DebugBusResp( ) extends Bundle { * Therefore it has the 'flipped' version of this. */ -class DebugBusIO(implicit val p: cde.Parameters) extends ParameterizedBundle()(p) { +class DebugBusIO(implicit val p: Parameters) extends ParameterizedBundle()(p) { val req = new DecoupledIO(new DebugBusReq(p(DMKey).nDebugBusAddrSize)) val resp = new DecoupledIO(new DebugBusResp).flip() } -class AsyncDebugBusIO(implicit val p: cde.Parameters) extends ParameterizedBundle()(p) { +class AsyncDebugBusIO(implicit val p: Parameters) extends ParameterizedBundle()(p) { val req = new AsyncBundle(1, new DebugBusReq(p(DMKey).nDebugBusAddrSize)) val resp = new AsyncBundle(1, new DebugBusResp).flip } diff --git a/src/main/scala/unittest/TestHarness.scala b/src/main/scala/unittest/TestHarness.scala index 8ddc1364..b5804646 100644 --- a/src/main/scala/unittest/TestHarness.scala +++ b/src/main/scala/unittest/TestHarness.scala @@ -3,8 +3,9 @@ package unittest import Chisel._ +import cde._ -class TestHarness(implicit val p: cde.Parameters) extends Module { +class TestHarness(implicit val p: Parameters) extends Module { val io = new Bundle { val success = Bool(OUTPUT) } io.success := Module(new UnitTestSuite).io.finished } diff --git a/src/main/scala/util/GeneratorUtils.scala b/src/main/scala/util/GeneratorUtils.scala index 5ae69265..4227e1d1 100644 --- a/src/main/scala/util/GeneratorUtils.scala +++ b/src/main/scala/util/GeneratorUtils.scala @@ -43,7 +43,7 @@ trait HasGeneratorUtilities { def elaborate(names: ParsedInputNames, params: Parameters): Circuit = { val gen = () => Class.forName(names.fullTopModuleClass) - .getConstructor(classOf[cde.Parameters]) + .getConstructor(classOf[Parameters]) .newInstance(params) .asInstanceOf[Module]