diff --git a/rocket-chip b/rocket-chip
index 7f1d3c44..274d908d 160000
--- a/rocket-chip
+++ b/rocket-chip
@@ -1 +1 @@
-Subproject commit 7f1d3c445fbed98e4e16c508a23b92a90e349c3b
+Subproject commit 274d908d98617f928e47b192cc2f68a3f7ded512
diff --git a/src/main/scala/example/TestHarness.scala b/src/main/scala/example/TestHarness.scala
index b37bffac..d5357622 100644
--- a/src/main/scala/example/TestHarness.scala
+++ b/src/main/scala/example/TestHarness.scala
@@ -5,8 +5,6 @@ import rocketchip._
 import testchipip._
 import chisel3._
 import config.Parameters
-import _root_.util.{HasGeneratorUtilities, ParsedInputNames}
-import java.io.File
 
 class TestHarness(implicit val p: Parameters) extends Module {
   val io = IO(new Bundle {
@@ -25,32 +23,6 @@ class TestHarness(implicit val p: Parameters) extends Module {
   io.success := ser.io.exit
 }
 
-trait ExampleGeneratorApp extends App with HasGeneratorUtilities {
-  lazy val names = ParsedInputNames(
-    targetDir = args(0),
-    topModuleProject = args(1),
-    topModuleClass = args(2),
-    configProject = args(3),
-    configs = args(4))
-
-  lazy val config = getConfig(names)
-  lazy val world = config.toInstance
-  lazy val params = Parameters.root(world)
-  lazy val circuit = Driver.elaborate(() =>
-      Class.forName(names.fullTopModuleClass)
-        .getConstructor(classOf[Parameters])
-        .newInstance(params)
-        .asInstanceOf[Module])
-
-  lazy val longName = names.topModuleProject + "." +
-                 names.topModuleClass + "." +
-                 names.configs
-
-  def generateFirrtl =
-    Driver.dumpFirrtl(circuit,
-      Some(new File(names.targetDir, s"$longName.fir")))
-}
-
-object Generator extends ExampleGeneratorApp {
+object Generator extends GeneratorApp {
   generateFirrtl
 }
diff --git a/src/main/scala/pwm/TestHarness.scala b/src/main/scala/pwm/TestHarness.scala
index fa273a69..2e6d9c73 100644
--- a/src/main/scala/pwm/TestHarness.scala
+++ b/src/main/scala/pwm/TestHarness.scala
@@ -2,12 +2,13 @@ package pwm
 
 import config.Parameters
 import diplomacy.LazyModule
+import testchipip.GeneratorApp
 
 class TestHarness(q: Parameters) extends example.TestHarness()(q) {
   override def buildTop(p: Parameters) =
     LazyModule(new ExampleTopWithPWM()(p))
 }
 
-object Generator extends example.ExampleGeneratorApp {
+object Generator extends GeneratorApp {
   generateFirrtl
 }
diff --git a/testchipip b/testchipip
index edecf84b..8bd439f3 160000
--- a/testchipip
+++ b/testchipip
@@ -1 +1 @@
-Subproject commit edecf84bfe8b4a2678de9e1e33d506f654e5c16f
+Subproject commit 8bd439f37b0e80a045ab35558d044ca5020e7edd