diff --git a/generators/chipyard/src/main/scala/ConfigFragments.scala b/generators/chipyard/src/main/scala/ConfigFragments.scala
index 479120ba..c5c85e47 100644
--- a/generators/chipyard/src/main/scala/ConfigFragments.scala
+++ b/generators/chipyard/src/main/scala/ConfigFragments.scala
@@ -151,6 +151,11 @@ class WithRocketDCacheScratchpad extends Config((site, here, up) => {
   }
 })
 
+// Replaces the L2 with a broadcast manager for maintaining coherence
+class WithBroadcastManager extends Config((site, here, up) => {
+  case BankedL2Key => up(BankedL2Key, site).copy(coherenceManager = CoherenceManagerWrapper.broadcastManager)
+})
+
 class WithHwachaTest extends Config((site, here, up) => {
   case TestSuitesKey => (tileParams: Seq[TileParams], suiteHelper: TestSuiteHelper, p: Parameters) => {
     up(TestSuitesKey).apply(tileParams, suiteHelper, p)
diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile
index 65e64179..2b250ee9 100644
--- a/sims/verilator/Makefile
+++ b/sims/verilator/Makefile
@@ -84,7 +84,7 @@ TRACING_CFLAGS := $(if $(filter $(VERILATOR_FST_MODE),0),,-DCY_FST_TRACE)
 #----------------------------------------------------------------------------------------
 # we initially had --noassert for performance, but several modules use
 # assertions, including dramsim, so we enable --assert by default
-VERILATOR_OPT_FLAGS := \
+VERILATOR_OPT_FLAGS ?= \
 	-O3 \
 	--x-assign fast \
 	--x-initial fast \
diff --git a/software/firemarshal b/software/firemarshal
index 45aebace..199f23ed 160000
--- a/software/firemarshal
+++ b/software/firemarshal
@@ -1 +1 @@
-Subproject commit 45aebace86d3a46c357337a19d4c8e894a5d0ed4
+Subproject commit 199f23ed74f723313b3bf225a9b4cfed8b6f6399