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

Merge pull request #1060 from ucb-bar/chisel-3.5-published

Browse Source 
Bump to Chisel 3.5 RC
This commit is contained in:
Abraham Gonzalez
2022-02-10 17:09:06 -08:00
committed by GitHub
parent 534fde1c0f 40a5f36d50
commit 0fe908bfec
33 changed files with 82 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,28 +1,30 @@
diff --git a/build.sbt b/build.sbt
index 2187fe12..2319fc95 100644
index bbbb8251..b7adcb73 100644
--- a/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"))
.dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
- sha3, // On separate line to allow for cleaner tutorial-setup patches
+ //sha3, // On separate line to allow for cleaner tutorial-setup patches
+// sha3, // On separate line to allow for cleaner tutorial-setup patches
dsptools, `rocket-dsp-utils`,
gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex, fft_generator)
.settings(libraryDependencies ++= rocketLibDeps.value)
@@ -203,10 +203,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
@@ -189,11 +189,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
.settings(libraryDependencies ++= rocketLibDeps.value)
.settings(commonSettings)
-lazy val sha3 = (project in file("generators/sha3"))
- .dependsOn(rocketchip, chisel_testers, midasTargetUtils)
- .dependsOn(rocketchip, midasTargetUtils)
- .settings(libraryDependencies ++= rocketLibDeps.value)
- .settings(chiselTestSettings)
- .settings(commonSettings)
+//lazy val sha3 = (project in file("generators/sha3"))
+// .dependsOn(rocketchip, chisel_testers, midasTargetUtils)
+// .dependsOn(rocketchip, midasTargetUtils)
+// .settings(libraryDependencies ++= rocketLibDeps.value)
+// .settings(chiselTestSettings)
+// .settings(commonSettings)
lazy val gemmini = (project in file("generators/gemmini"))
.dependsOn(testchipip, rocketchip, chisel_testers)
.dependsOn(testchipip, rocketchip)