From fc9c676fc1c6bd416670873bc76ed2703dbb7f0c Mon Sep 17 00:00:00 2001
From: Henry Cook <hcook@eecs.berkeley.edu>
Date: Thu, 26 Sep 2013 12:01:46 -0700
Subject: [PATCH] add chisel and hardfloat back as sub-projects, bump other
 sub-projects

---
 .gitmodules              |  6 ++++++
 chisel                   |  1 +
 hardfloat                |  1 +
 project/build.properties |  2 +-
 project/build.scala      | 24 +++++++++++++-----------
 rocket                   |  2 +-
 uncore                   |  2 +-
 7 files changed, 24 insertions(+), 14 deletions(-)
 create mode 160000 chisel
 create mode 160000 hardfloat

diff --git a/.gitmodules b/.gitmodules
index 70fedbb8..58554827 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,9 @@
 [submodule "rocket"]
 	path = rocket
 	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
diff --git a/chisel b/chisel
new file mode 160000
index 00000000..a7b26467
--- /dev/null
+++ b/chisel
@@ -0,0 +1 @@
+Subproject commit a7b26467b7cf395563dcd9a593731ab17d95450d
diff --git a/hardfloat b/hardfloat
new file mode 160000
index 00000000..904573db
--- /dev/null
+++ b/hardfloat
@@ -0,0 +1 @@
+Subproject commit 904573db955172685a8663c2d9d41c8edbb7d55e
diff --git a/project/build.properties b/project/build.properties
index c2df4283..0974fce4 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.0-RC2
+sbt.version=0.13.0
diff --git a/project/build.scala b/project/build.scala
index 5bf510a4..cdcf48fb 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -15,20 +15,22 @@ object BuildSettings extends Build {
     scalaVersion := buildScalaVersion,
     traceLevel   := 15,
     scalacOptions ++= Seq("-deprecation","-unchecked"),
-    libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value,
-                            "edu.berkeley.cs" %% "chisel" % "2.1-SNAPSHOT",
-                            "edu.berkeley.cs" %% "hardfloat" % "1.2"),
-    resolvers ++= Seq(
-      "Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
-      "Sonatype Releases" at "http://oss.sonatype.org/content/repositories/releases",
-      "scct-github-repository" at "http://mtkopone.github.com/scct/maven-repo"
-    )
+    libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
+    //                        "edu.berkeley.cs" %% "chisel" % "2.3-SNAPSHOT",
+    //                        "edu.berkeley.cs" %% "hardfloat" % "1.2"),
+    //resolvers ++= Seq(
+    //  "Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
+    //  "Sonatype Releases" at "http://oss.sonatype.org/content/repositories/releases",
+    //  "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 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 makeTask = InputKey[Unit]("make", "trigger backend-specific makefile command")
diff --git a/rocket b/rocket
index 9c7b8454..d8a1ad40 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 9c7b8454f8f8f66df08eb587a025319b185490a0
+Subproject commit d8a1ad40d8107b8c096b17ae8a04a29bf6e1b8d3
diff --git a/uncore b/uncore
index e3fe5f9d..60ce1070 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit e3fe5f9d8d6545c972de4317569a55ffb06ab5c9
+Subproject commit 60ce1070d6b75a0e3134e545aeadc0565b4a905e