Skip to content

Commit

Permalink
Bump Chisel to 3.5.2 and Scala to 2.12.15 (#2947)
Browse files Browse the repository at this point in the history
Update from running new version of Scalafix
  • Loading branch information
jackkoenig authored Mar 17, 2022
1 parent 0c21135 commit fdc08f5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import scala.sys.process._

enablePlugins(PackPlugin)

val chiselVersion = "3.5.1"
val chiselVersion = "3.5.2"

lazy val commonSettings = Seq(
organization := "edu.berkeley.cs",
version := "1.2-SNAPSHOT",
scalaVersion := "2.12.10",
scalaVersion := "2.12.15",
parallelExecution in Global := false,
traceLevel := 15,
scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")

addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.5" )

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
2 changes: 1 addition & 1 deletion src/main/scala/rocket/ScratchpadSlavePort.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import freechips.rocketchip.util._

/* This adapter converts between diplomatic TileLink and non-diplomatic HellaCacheIO */
class ScratchpadSlavePort(address: Seq[AddressSet], coreDataBytes: Int, usingAtomics: Boolean)(implicit p: Parameters) extends LazyModule {
def this(address: AddressSet, coreDataBytes: Int, usingAtomics: Boolean)(implicit p: Parameters) {
def this(address: AddressSet, coreDataBytes: Int, usingAtomics: Boolean)(implicit p: Parameters) = {
this(Seq(address), coreDataBytes, usingAtomics)
}

Expand Down

0 comments on commit fdc08f5

Please sign in to comment.