2 files changed, 17 insertions, 1 deletions

diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 6dd7918506a94..6547d0e7c9f49 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -75,6 +75,14 @@ device		sbus
 device		central
 device		fhc
 
+# New OpenFirmware PCI framework. This fixes a number of interrupt-
+# routing problems and changes the device enumeration to be hopefully
+# closer to Solaris. Be aware that, because of the latter, enabling or
+# disabling this option may require reconfiguration, and can even
+# cause the machine to not boot without manual intervention before the
+# fstab is adjusted.
+#options 	OFW_NEWPCI
+
 # Floppy drives
 #device		fdc
 
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 7d6c020c69cf7..56c3f136f2ebe 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -17,7 +17,7 @@ machine		sparc64
 # You must specify at least one CPU (the one you intend to run on);
 # deleting the specification for CPUs you don't need to use may make
 # parts of the system run faster.
-# XXX: On the Sparc6, there is only one CPU type
+# XXX: On the Sparc64, there is only one CPU type
 cpu		SUN4U
 
 
@@ -32,6 +32,14 @@ device		sbus
 device		central
 device		fhc
 
+# New OpenFirmware PCI framework. This fixes a number of interrupt-
+# routing problems and changes the device enumeration to be hopefully
+# closer to Solaris. Be aware that, because of the latter, enabling or
+# disabling this option may require reconfiguration, and can even
+# cause the machine to not boot without manual intervention before the
+# fstab is adjusted.
+#options 	OFW_NEWPCI
+
 
 #####################################################################
 # HARDWARE DEVICE CONFIGURATION