diff --git a/sims/firesim b/sims/firesim
index 65be3cae..7f8152e5 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 65be3cae99022375fb2babbc242cc433d5671b86
+Subproject commit 7f8152e5114c7f7793df54a41a53a9e6a04fa8cd
diff --git a/variables.mk b/variables.mk
index 91060aed..da3a9a6e 100644
--- a/variables.mk
+++ b/variables.mk
@@ -74,18 +74,19 @@ ifeq ($(SUB_PROJECT),hwacha)
 	TB                ?= TestDriver
 	TOP               ?= ExampleRocketSystem
 endif
-# Stand-in firechip variables
-ifeq ($(SUB_PROJECT),firechip)
-	SBT_PROJECT       ?= $(SUB_PROJECT)
-	MODEL             ?= TestHarness
-	VLOG_MODEL        ?= TestHarness
-	MODEL_PACKAGE     ?= freechips.rocketchip.system
-	CONFIG            ?= FireSimRocketChipConfig
-	CONFIG_PACKAGE    ?= firesim.firesim
-	GENERATOR_PACKAGE ?= firesim.firesim
-	TB                ?= TestDriver
-	TOP               ?= FireSimNoNIC
-endif
+# Stand-in firechip variables:
+# TODO: need a seperate generator and test harnesses for each target
+#ifeq ($(SUB_PROJECT),firechip)
+#	SBT_PROJECT       ?= $(SUB_PROJECT)
+#	MODEL             ?= TestHarness
+#	VLOG_MODEL        ?= TestHarness
+#	MODEL_PACKAGE     ?= freechips.rocketchip.system
+#	CONFIG            ?= FireSimRocketChipConfig
+#	CONFIG_PACKAGE    ?= firesim.firesim
+#	GENERATOR_PACKAGE ?= firesim.firesim
+#	TB                ?= TestDriver
+#	TOP               ?= FireSimNoNIC
+#endif
 
 #########################################################################################
 # path to rocket-chip and testchipip