add chisel and hardfloat back as sub-projects, bump other sub-projects
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -10,3 +10,9 @@
|
|||||||
[submodule "rocket"]
|
[submodule "rocket"]
|
||||||
path = rocket
|
path = rocket
|
||||||
url = git@github.com:ucb-bar/riscv-rocket.git
|
url = git@github.com:ucb-bar/riscv-rocket.git
|
||||||
|
[submodule "chisel"]
|
||||||
|
path = chisel
|
||||||
|
url = git@github.com:ucb-bar/chisel.git
|
||||||
|
[submodule "hardfloat"]
|
||||||
|
path = hardfloat
|
||||||
|
url = git@github.com:ucb-bar/hardfloat.git
|
||||||
|
1
chisel
Submodule
1
chisel
Submodule
Submodule chisel added at a7b26467b7
1
hardfloat
Submodule
1
hardfloat
Submodule
Submodule hardfloat added at 904573db95
@ -1 +1 @@
|
|||||||
sbt.version=0.13.0-RC2
|
sbt.version=0.13.0
|
||||||
|
@ -15,20 +15,22 @@ object BuildSettings extends Build {
|
|||||||
scalaVersion := buildScalaVersion,
|
scalaVersion := buildScalaVersion,
|
||||||
traceLevel := 15,
|
traceLevel := 15,
|
||||||
scalacOptions ++= Seq("-deprecation","-unchecked"),
|
scalacOptions ++= Seq("-deprecation","-unchecked"),
|
||||||
libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value,
|
libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
|
||||||
"edu.berkeley.cs" %% "chisel" % "2.1-SNAPSHOT",
|
// "edu.berkeley.cs" %% "chisel" % "2.3-SNAPSHOT",
|
||||||
"edu.berkeley.cs" %% "hardfloat" % "1.2"),
|
// "edu.berkeley.cs" %% "hardfloat" % "1.2"),
|
||||||
resolvers ++= Seq(
|
//resolvers ++= Seq(
|
||||||
"Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
|
// "Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
|
||||||
"Sonatype Releases" at "http://oss.sonatype.org/content/repositories/releases",
|
// "Sonatype Releases" at "http://oss.sonatype.org/content/repositories/releases",
|
||||||
"scct-github-repository" at "http://mtkopone.github.com/scct/maven-repo"
|
// "scct-github-repository" at "http://mtkopone.github.com/scct/maven-repo"
|
||||||
)
|
//)
|
||||||
)
|
)
|
||||||
|
|
||||||
lazy val hwacha = Project("hwacha", file("hwacha"), settings = buildSettings)
|
|
||||||
lazy val uncore = Project("uncore", file("uncore"), settings = buildSettings)
|
|
||||||
lazy val rocket = Project("rocket", file("rocket"), settings = buildSettings) dependsOn(uncore,hwacha)
|
|
||||||
lazy val referencechip = Project("referencechip", file("."), settings = buildSettings ++ chipSettings) dependsOn(rocket)
|
lazy val referencechip = Project("referencechip", file("."), settings = buildSettings ++ chipSettings) dependsOn(rocket)
|
||||||
|
lazy val chisel = Project("chisel", file("chisel"), settings = buildSettings)
|
||||||
|
lazy val hardfloat = Project("hardfloat", file("hardfloat"), settings = buildSettings) dependsOn(chisel)
|
||||||
|
lazy val hwacha = Project("hwacha", file("hwacha"), settings = buildSettings) dependsOn(hardfloat)
|
||||||
|
lazy val uncore = Project("uncore", file("uncore"), settings = buildSettings) dependsOn(chisel)
|
||||||
|
lazy val rocket = Project("rocket", file("rocket"), settings = buildSettings) dependsOn(uncore,hwacha)
|
||||||
|
|
||||||
val elaborateTask = InputKey[Unit]("elaborate", "convert chisel components into backend source code")
|
val elaborateTask = InputKey[Unit]("elaborate", "convert chisel components into backend source code")
|
||||||
val makeTask = InputKey[Unit]("make", "trigger backend-specific makefile command")
|
val makeTask = InputKey[Unit]("make", "trigger backend-specific makefile command")
|
||||||
|
2
rocket
2
rocket
Submodule rocket updated: 9c7b8454f8...d8a1ad40d8
2
uncore
2
uncore
Submodule uncore updated: e3fe5f9d8d...60ce1070d6
Reference in New Issue
Block a user