diff --git a/build.sbt b/build.sbt
index 5c83ecae..f54d02f6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -158,7 +158,7 @@ lazy val chipyard = (project in file("generators/chipyard"))
     dsptools, rocket_dsp_utils,
     gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex, fft_generator,
     constellation, mempress, barf, shuttle, caliptra_aes, rerocc,
-    compressacc, saturn, ara, firrtl2_bridge, vexiiriscv, ofo)
+    compressacc, saturn, ara, firrtl2_bridge, vexiiriscv/*, ofo*/)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(
     libraryDependencies ++= Seq(
@@ -408,10 +408,11 @@ lazy val firechip = (project in file("generators/firechip/chip"))
     Test / testOptions += Tests.Argument("-oF")
   )
   .settings(scalaTestSettings)
-  
+
+/*
 lazy val ofo = (project in file("generators/ofo"))
   .dependsOn(rocketchip)
     .settings(libraryDependencies ++= rocketLibDeps.value)
       .settings(chiselSettings)
         .settings(commonSettings)
-
+*/
diff --git a/common.mk b/common.mk
index 6154602c..8ce55624 100644
--- a/common.mk
+++ b/common.mk
@@ -64,10 +64,13 @@ HELP_COMMANDS += \
 #########################################################################################
 include $(base_dir)/generators/cva6/cva6.mk
 include $(base_dir)/generators/ibex/ibex.mk
-include $(base_dir)/generators/ara/ara.mk
+-include $(base_dir)/generators/ara/ara.mk
 include $(base_dir)/generators/tracegen/tracegen.mk
 include $(base_dir)/generators/nvdla/nvdla.mk
 include $(base_dir)/tools/torture.mk
+# Optional generator make fragments should not fail build if absent
+# Wildcard include for standardized per-generator make fragments
+-include $(wildcard $(base_dir)/generators/*/chipyard.mk)
 
 #########################################################################################
 # Prerequisite lists
diff --git a/generators/chipyard/src/main/scala/config/OFOConfigs.scala b/generators/chipyard/src/main/scala/config/OFOConfigs.scala.exclude
similarity index 100%
rename from generators/chipyard/src/main/scala/config/OFOConfigs.scala
rename to generators/chipyard/src/main/scala/config/OFOConfigs.scala.exclude