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

[sbt] Seperate settings assignments onto multiple lines

Browse Source
This commit is contained in:
David Biancolin
2021-12-08 07:16:24 +00:00
parent df8161c3da
commit 170994ac9d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@@ -119,7 +119,8 @@ lazy val rocketConfig = (project in rocketChipDir / "api-config-chipsalliance/bu
lazy val rocketchip = freshProject("rocketchip", rocketChipDir) lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
.dependsOn(hardfloat, rocketMacros, rocketConfig) .dependsOn(hardfloat, rocketMacros, rocketConfig)
.settings(commonSettings, chiselSettings) .settings(commonSettings)
.settings(chiselSettings)
.settings( .settings(
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value, "org.scala-lang" % "scala-reflect" % scalaVersion.value,

6
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 a00d7361..fbdf2e53 100644 index 2187fe12..2319fc95 100644
--- a/build.sbt --- a/build.sbt
+++ b/build.sbt +++ b/build.sbt
@@ -161,7 +161,7 @@ lazy val testchipip = (project in file("generators/testchipip")) @@ -162,7 +162,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,7 +11,7 @@ index a00d7361..fbdf2e53 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)
@@ -202,10 +202,10 @@ lazy val sodor = (project in file("generators/riscv-sodor")) @@ -203,10 +203,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
.settings(libraryDependencies ++= rocketLibDeps.value) .settings(libraryDependencies ++= rocketLibDeps.value)
.settings(commonSettings) .settings(commonSettings)