Index: conf/MPC85XX
===================================================================
--- conf/MPC85XX        (revision 238300)
+++ conf/MPC85XX        (working copy)
@@ -25,12 +25,14 @@
 options        CD9660
 options        COMPAT_43
 options        DDB
-#options       DEADLKRES
+options        DEADLKRES
 options        DEVICE_POLLING
-#options       DIAGNOSTIC
+options        DIAGNOSTIC
 options        FDT
-makeoptions    FDT_DTS_FILE=mpc8572ds.dts
+#makeoptions   FDT_DTS_FILE=mpc8572ds.dts
 #makeoptions   FDT_DTS_FILE=mpc8555cds.dts
+makeoptions    FDT_DTS_FILE=mpc8547cds.dts
+options                FDT_DTB_STATIC
 options        FFS
 options        GDB
 options        GEOM_PART_GPT
@@ -74,7 +76,7 @@
 device         md
 device         miibus
 device         pass
-device         pci
+#device                pci
 device         quicc
 device         random
 #device                rl