Merge pull request #1176 from ucb-bar/tutorial-friendly

improvements to minimize diff during tutorials

docs/Generators/SHA3.rst

@@ -72,7 +72,7 @@ it can be mixed into a Rocket or BOOM core by overriding the
 generator. An example configuration highlighting the use of
 this config fragment is shown here:
 
-.. literalinclude:: ../../generators/chipyard/src/main/scala/config/RocketConfigs.scala
+.. literalinclude:: ../../generators/chipyard/src/main/scala/config/RocketSha3Configs.scala
    :language: scala
    :start-after: DOC include start: Sha3Rocket
    :end-before: DOC include end: Sha3Rocket

generators/chipyard/src/main/scala/config/RocketConfigs.scala

@@ -119,13 +119,6 @@ class GB1MemoryRocketConfig extends Config(
   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
   new chipyard.config.AbstractConfig)
 
-// DOC include start: Sha3Rocket
-class Sha3RocketConfig extends Config(
-  new sha3.WithSha3Accel ++                                // add SHA3 rocc accelerator
-  new freechips.rocketchip.subsystem.WithNBigCores(1) ++
-  new chipyard.config.AbstractConfig)
-// DOC include end: Sha3Rocket
-
 // DOC include start: InitZeroRocketConfig
 class InitZeroRocketConfig extends Config(
   new chipyard.example.WithInitZero(0x88000000L, 0x1000L) ++   // add InitZero

generators/chipyard/src/main/scala/config/RocketSha3Configs.scala

@@ -0,0 +1,23 @@
+package chipyard
+
+import freechips.rocketchip.config.{Config}
+import freechips.rocketchip.diplomacy.{AsynchronousCrossing}
+
+// --------------
+// Rocket+SHA3 Configs
+// These live in a separate file to simplify patching out for the tutorials.
+// --------------
+
+// DOC include start: Sha3Rocket
+class Sha3RocketConfig extends Config(
+  new sha3.WithSha3Accel ++                                // add SHA3 rocc accelerator
+  new freechips.rocketchip.subsystem.WithNBigCores(1) ++
+  new chipyard.config.AbstractConfig)
+// DOC include end: Sha3Rocket
+
+class Sha3RocketPrintfConfig extends Config(
+  new sha3.WithSha3Printf ++
+  new sha3.WithSha3Accel ++                                // add SHA3 rocc accelerator
+  new freechips.rocketchip.subsystem.WithNBigCores(1) ++
+  new chipyard.config.AbstractConfig)
+

scripts/tutorial-patches/RocketConfigs.scala.patch

@@ -1,13 +0,0 @@
-diff --git a/generators/chipyard/src/main/scala/config/RocketConfigs.scala b/generators/chipyard/src/main/scala/config/RocketConfigs.scala
-index 8e6e486..fc3a811 100644
---- a/generators/chipyard/src/main/scala/config/RocketConfigs.scala
-+++ b/generators/chipyard/src/main/scala/config/RocketConfigs.scala
-@@ -105,7 +105,7 @@ class GB1MemoryRocketConfig extends Config(
- 
- // DOC include start: Sha3Rocket
- class Sha3RocketConfig extends Config(
--  new sha3.WithSha3Accel ++                                // add SHA3 rocc accelerator
-+//  new sha3.WithSha3Accel ++                                // add SHA3 rocc accelerator
-   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
-   new chipyard.config.AbstractConfig)
- // DOC include end: Sha3Rocket

scripts/tutorial-setup.sh

@@ -2,7 +2,8 @@
 
 set -e -x
 
-rm -rf generators/sha3
+git rm generators/chipyard/src/main/scala/config/RocketSha3Configs.scala
+git rm -rf generators/sha3
 
 for p in scripts/tutorial-patches/*.patch
 do