From 0e6080682b3dd0ce11cdfed1292ec20e70d75f80 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 20 Jan 2022 20:30:17 -0800 Subject: [PATCH] Use Chisel 3.5-SNAPSHOT fixes --- build.sbt | 7 ++++--- sims/firesim | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index c6194322..7f415871 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ lazy val chipyardRoot = Project("chipyardRoot", file(".")) lazy val commonSettings = Seq( organization := "edu.berkeley.cs", - version := "1.3", + version := "1.6", scalaVersion := "2.12.10", assembly / test := {}, assembly / assemblyMergeStrategy := { _ match { @@ -66,11 +66,11 @@ lazy val chiselSettings = Seq( libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion), addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full)) -val firrtlVersion = "1.5.0" +val firrtlVersion = "1.5-SNAPSHOT" lazy val firrtlSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "firrtl" % firrtlVersion)) -val chiselTestVersion = "2.5.0" +val chiselTestVersion = "2.5-SNAPSHOT" lazy val chiselTestSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel-iotesters" % chiselTestVersion)) @@ -147,6 +147,7 @@ lazy val chipyard = (project in file("generators/chipyard")) dsptools, `rocket-dsp-utils`, gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex) .settings(libraryDependencies ++= rocketLibDeps.value) + .settings(chiselSettings) .settings(commonSettings) lazy val tracegen = (project in file("generators/tracegen")) diff --git a/sims/firesim b/sims/firesim index 0a68c1b2..beba9262 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 0a68c1b24afc7a0b50a0c7eea17c4b2054c0cb6a +Subproject commit beba9262902c2e3e7551f83f6ea4e196e137211a