From a494f88af0acb161a3523ff8597ed914e2a47218 Mon Sep 17 00:00:00 2001
From: Colin Schmidt <colins@eecs.berkeley.edu>
Date: Sun, 25 Aug 2019 08:22:41 -0700
Subject: [PATCH] Add sha3 repo and config, bump tools for xcustom fix

---
 .gitmodules                                     | 3 +++
 build.sbt                                       | 6 +++++-
 generators/example/src/main/scala/Configs.scala | 4 ++++
 generators/rocc-template                        | 1 +
 toolchains/esp-tools                            | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 160000 generators/rocc-template

diff --git a/.gitmodules b/.gitmodules
index 26846989..fc31b672 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "tools/treadle"]
 	path = tools/treadle
 	url = https://github.com/freechipsproject/treadle.git
+[submodule "generators/rocc-template"]
+	path = generators/rocc-template
+	url = https://github.com/ucb-bar/rocc-template.git
diff --git a/build.sbt b/build.sbt
index c5562c45..9f33da3d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -106,7 +106,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
   .settings(commonSettings)
 
 lazy val example = conditionalDependsOn(project in file("generators/example"))
-  .dependsOn(boom, hwacha, sifive_blocks, sifive_cache)
+  .dependsOn(boom, hwacha, sifive_blocks, sifive_cache, rocc_template)
   .settings(commonSettings)
 
 lazy val utilities = conditionalDependsOn(project in file("generators/utilities"))
@@ -124,6 +124,10 @@ lazy val boom = (project in file("generators/boom"))
   .dependsOn(rocketchip)
   .settings(commonSettings)
 
+lazy val rocc_template = (project in file("generators/rocc-template"))
+  .dependsOn(rocketchip, `chisel-testers`)
+  .settings(commonSettings)
+
 lazy val tapeout = conditionalDependsOn(project in file("./tools/barstools/tapeout/"))
   .settings(commonSettings)
 
diff --git a/generators/example/src/main/scala/Configs.scala b/generators/example/src/main/scala/Configs.scala
index c7e70dd2..098b4e16 100644
--- a/generators/example/src/main/scala/Configs.scala
+++ b/generators/example/src/main/scala/Configs.scala
@@ -27,6 +27,10 @@ class RoccRocketConfig extends Config(
   new WithRoccExample ++
   new DefaultRocketConfig)
 
+class Sha3RocketConfig extends Config(
+  new sha3.WithSha3Accel ++
+  new DefaultRocketConfig)
+
 class PWMRocketConfig extends Config(
   new WithPWMBoomRocketTop ++
   new BaseRocketConfig)
diff --git a/generators/rocc-template b/generators/rocc-template
new file mode 160000
index 00000000..fa165f8a
--- /dev/null
+++ b/generators/rocc-template
@@ -0,0 +1 @@
+Subproject commit fa165f8a54c492cacd794964120b56d48d2fe7b2
diff --git a/toolchains/esp-tools b/toolchains/esp-tools
index aba7bd82..f13ae53f 160000
--- a/toolchains/esp-tools
+++ b/toolchains/esp-tools
@@ -1 +1 @@
-Subproject commit aba7bd828d4fd1c5fc3ac227524ccfd350410ade
+Subproject commit f13ae53fcd09c1119a1697df37335718904fc7be