Index: sys/mips/conf/SENTRY5
===================================================================
--- sys/mips/conf/SENTRY5
+++ sys/mips/conf/SENTRY5
@@ -78,8 +78,8 @@
 device		uhci			# UHCI PCI->USB interface
 device		ehci			# EHCI PCI->USB interface (USB 2.0)
 
-# need to teach the code to ignore the bridge....
-
+device		cfi
+device		cfid
 
 # XXX notyet; need to be auto probed children of siba_cc.
 #device		uart
Index: sys/mips/sentry5/files.sentry5
===================================================================
--- sys/mips/sentry5/files.sentry5
+++ sys/mips/sentry5/files.sentry5
@@ -7,3 +7,6 @@
 mips/sentry5/s5_machdep.c		standard
 mips/mips/intr_machdep.c		standard
 mips/mips/tick.c			standard
+
+# TODO: Replace with BCM47xx/57xx/etc-aware geom_map
+geom/geom_flashmap.c			standard