diff --git a/build.sbt b/build.sbt index 8a1a8b60..9ce7d00c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,6 @@ // See LICENSE for license details. -val defaultVersions = Map( - "chisel3" -> "3.5.5", - "chisel-iotesters" -> "2.5.5" -) +val defaultVersions = Map("chisel3" -> "3.6.0") organization := "edu.berkeley.cs" version := "0.4-SNAPSHOT" @@ -13,7 +10,7 @@ scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls") Test / scalacOptions ++= Seq("-language:reflectiveCalls") fork := true mainClass := Some("barstools.macros.MacroCompiler") -libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { +libraryDependencies ++= Seq("chisel3").map { dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) } libraryDependencies ++= Seq( diff --git a/src/main/scala/barstools/iocell/chisel/IOCell.scala b/src/main/scala/barstools/iocell/chisel/IOCell.scala index b90e43ac..457fa12b 100644 --- a/src/main/scala/barstools/iocell/chisel/IOCell.scala +++ b/src/main/scala/barstools/iocell/chisel/IOCell.scala @@ -153,7 +153,7 @@ object IOCell { * @param name An optional name or name prefix to use for naming IO cells * @return A Seq of all generated IO cell instances */ - val toSyncReset: (Reset) => Bool = _.asBool() + val toSyncReset: (Reset) => Bool = _.asBool val toAsyncReset: (Reset) => AsyncReset = _.asAsyncReset def generateFromSignal[T <: Data, R <: Reset]( coreSignal: T, diff --git a/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala b/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala index 66200e61..ef98b294 100644 --- a/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala +++ b/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala @@ -8,7 +8,6 @@ class CustomBundle[T <: Data](elts: (String, T)*) extends Record { val elements = ListMap(elts.map { case (field, elt) => field -> chiselTypeOf(elt) }: _*) def apply(elt: String): T = elements(elt) def apply(elt: Int): T = elements(elt.toString) - override def cloneType = (new CustomBundle(elements.toList: _*)).asInstanceOf[this.type] } class CustomIndexedBundle[T <: Data](elts: (Int, T)*) extends Record { @@ -17,7 +16,6 @@ class CustomIndexedBundle[T <: Data](elts: (Int, T)*) extends Record { // TODO: Make an equivalent to the below work publicly (or only on subclasses?) def indexedElements = ListMap(elts.map { case (field, elt) => field -> chiselTypeOf(elt) }: _*) def apply(elt: Int): T = elements(elt.toString) - override def cloneType = (new CustomIndexedBundle(indexedElements.toList: _*)).asInstanceOf[this.type] } object CustomIndexedBundle {