wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update tutorial patch | Small warning fixes to build.sbt

Browse Source
This commit is contained in:
abejgonzalez
2022-01-17 11:26:21 -08:00
parent c42f369b47
commit 36e6a1736e
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.sbt
View File

@@ -8,8 +8,8 @@ lazy val commonSettings = Seq(
organization := "edu.berkeley.cs", organization := "edu.berkeley.cs",
version := "1.3", version := "1.3",
scalaVersion := "2.12.10", scalaVersion := "2.12.10",
test in assembly := {}, assembly / test := {},
assemblyMergeStrategy in assembly := { _ match { assembly / assemblyMergeStrategy := { _ match {
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
case _ => MergeStrategy.first}}, case _ => MergeStrategy.first}},
scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"), scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
@@ -48,8 +48,8 @@ lazy val firesimDir = if (firesimAsLibrary) {
def freshProject(name: String, dir: File): Project = { def freshProject(name: String, dir: File): Project = {
Project(id = name, base = dir / "src") Project(id = name, base = dir / "src")
.settings( .settings(
scalaSource in Compile := baseDirectory.value / "main" / "scala", Compile / scalaSource := baseDirectory.value / "main" / "scala",
resourceDirectory in Compile := baseDirectory.value / "main" / "resources" Compile / resourceDirectory := baseDirectory.value / "main" / "resources"
) )
} }
@@ -248,7 +248,7 @@ lazy val sifive_blocks = (project in file("generators/sifive-blocks"))
lazy val sifive_cache = (project in file("generators/sifive-cache")) lazy val sifive_cache = (project in file("generators/sifive-cache"))
.settings( .settings(
commonSettings, commonSettings,
scalaSource in Compile := baseDirectory.value / "design/craft") Compile / scalaSource := baseDirectory.value / "design/craft")
.dependsOn(rocketchip) .dependsOn(rocketchip)
.settings(libraryDependencies ++= rocketLibDeps.value) .settings(libraryDependencies ++= rocketLibDeps.value)

14
scripts/tutorial-patches/build.sbt.patch
View File

@@ -1,8 +1,8 @@
diff --git a/build.sbt b/build.sbt diff --git a/build.sbt b/build.sbt
index 2187fe12..2319fc95 100644 index 00460b96..1d37f975 100644
--- a/build.sbt --- a/build.sbt
+++ b/build.sbt +++ b/build.sbt
@@ -162,7 +162,7 @@ lazy val testchipip = (project in file("generators/testchipip")) @@ -143,7 +143,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
lazy val chipyard = (project in file("generators/chipyard")) lazy val chipyard = (project in file("generators/chipyard"))
.dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell, .dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
@@ -11,18 +11,20 @@ index 2187fe12..2319fc95 100644
dsptools, `rocket-dsp-utils`, dsptools, `rocket-dsp-utils`,
gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex) gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
.settings(libraryDependencies ++= rocketLibDeps.value) .settings(libraryDependencies ++= rocketLibDeps.value)
@@ -203,10 +203,10 @@ lazy val sodor = (project in file("generators/riscv-sodor")) @@ -184,11 +184,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
.settings(libraryDependencies ++= rocketLibDeps.value) .settings(libraryDependencies ++= rocketLibDeps.value)
.settings(commonSettings) .settings(commonSettings)
-lazy val sha3 = (project in file("generators/sha3")) -lazy val sha3 = (project in file("generators/sha3"))
- .dependsOn(rocketchip, chisel_testers, midasTargetUtils) - .dependsOn(rocketchip, midasTargetUtils)
- .settings(libraryDependencies ++= rocketLibDeps.value) - .settings(libraryDependencies ++= rocketLibDeps.value)
- .settings(chiselTestSettings)
- .settings(commonSettings) - .settings(commonSettings)
+//lazy val sha3 = (project in file("generators/sha3")) +//lazy val sha3 = (project in file("generators/sha3"))
+// .dependsOn(rocketchip, chisel_testers, midasTargetUtils) +// .dependsOn(rocketchip, midasTargetUtils)
+// .settings(libraryDependencies ++= rocketLibDeps.value) +// .settings(libraryDependencies ++= rocketLibDeps.value)
+// .settings(chiselTestSettings)
+// .settings(commonSettings) +// .settings(commonSettings)
lazy val gemmini = (project in file("generators/gemmini")) lazy val gemmini = (project in file("generators/gemmini"))
.dependsOn(testchipip, rocketchip, chisel_testers) .dependsOn(testchipip, rocketchip)