diff --git a/rocket-chip b/rocket-chip
index af3976aa..6d0821f1 160000
--- a/rocket-chip
+++ b/rocket-chip
@@ -1 +1 @@
-Subproject commit af3976aa6795f74110e5323c19fc0f5f38f9dbca
+Subproject commit 6d0821f19a7a791df12df90421556aab8d649d43
diff --git a/src/main/scala/example/Configs.scala b/src/main/scala/example/Configs.scala
index 75ab6d9e..311bdbc5 100644
--- a/src/main/scala/example/Configs.scala
+++ b/src/main/scala/example/Configs.scala
@@ -1,7 +1,7 @@
 package example
 
 import chisel3._
-import freechips.rocketchip.chip.WithoutTLMonitors
+import freechips.rocketchip.chip._
 import freechips.rocketchip.config.{Parameters, Config}
 import freechips.rocketchip.coreplex.WithRoccExample
 import freechips.rocketchip.diplomacy.LazyModule
@@ -76,3 +76,6 @@ class SimNetworkConfig extends Config(
 
 class WithTwoTrackers extends WithNBlockDeviceTrackers(2)
 class WithFourTrackers extends WithNBlockDeviceTrackers(4)
+
+class WithTwoMemChannels extends WithNMemoryChannels(2)
+class WithFourMemChannels extends WithNMemoryChannels(4)
diff --git a/testchipip b/testchipip
index 80069b22..3935fdb0 160000
--- a/testchipip
+++ b/testchipip
@@ -1 +1 @@
-Subproject commit 80069b22aa20eaae127f64bd446af13340775c66
+Subproject commit 3935fdb073a5c96c797302f7e86091df06596b94