diff --git a/fpga/Makefile b/fpga/Makefile
index 60d67d4e..be059e65 100644
--- a/fpga/Makefile
+++ b/fpga/Makefile
@@ -112,8 +112,7 @@ include $(base_dir)/common.mk
 #########################################################################################
 all_vsrcs := \
 	$(sim_vsrcs) \
-	$(base_dir)/generators/sifive-blocks/vsrc/SRLatch.v \
-	$(fpga_dir)/common/vsrc/PowerOnResetFPGAOnly.v
+	$(base_dir)/generators/sifive-blocks/vsrc/SRLatch.v
 
 #########################################################################################
 # vivado rules
diff --git a/fpga/fpga-shells b/fpga/fpga-shells
index 60adb8c6..f1187f21 160000
--- a/fpga/fpga-shells
+++ b/fpga/fpga-shells
@@ -1 +1 @@
-Subproject commit 60adb8c62c81c57b7eabd0402d9505c0ea1545f9
+Subproject commit f1187f21a0e0a36366e43994f936d04329bfc630