diff --git a/build.sbt b/build.sbt index b50bc200..8856a20c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,5 @@ import Tests._ -// Ignore linting for traceLevel -Global / excludeLintKeys += traceLevel - // This gives us a nicer handle to the root project instead of using the // implicit one lazy val chipyardRoot = Project("chipyardRoot", file(".")) @@ -11,7 +8,6 @@ lazy val commonSettings = Seq( organization := "edu.berkeley.cs", version := "1.3", scalaVersion := "2.12.10", - traceLevel := 15, test in assembly := {}, assemblyMergeStrategy in assembly := { _ match { case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard diff --git a/sims/firesim b/sims/firesim index 6dc98f6c..2addd725 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 6dc98f6cff25b348d3e2bf72fa17f2348c816b2f +Subproject commit 2addd72598212424d8a4832b2d78b11c95d74337