svn commit: r197321 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/ciss dev/xen/xenpci powerpc/conf

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Sep 19 01:49:36 2009
New Revision: 197321
URL: http://svn.freebsd.org/changeset/base/197321

Log:
  MFC r197080
  
  Add a few SCSI controllers to GENERIC that can be found in Powermacs.
  This allows installation onto SCSI disks as shipped, for example,
  as an option with the Powermac G3.
  
  PR:		powerpc/138543
  Reviewed by:	grehan
  Approved by:	re (kib)
  Obtained from:	sparc64

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/ciss/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/powerpc/conf/GENERIC

Modified: stable/8/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/8/sys/powerpc/conf/GENERIC	Sat Sep 19 01:48:12 2009	(r197320)
+++ stable/8/sys/powerpc/conf/GENERIC	Sat Sep 19 01:49:36 2009	(r197321)
@@ -83,6 +83,16 @@ device		atapicd		# ATAPI CDROM drives
 #device		atapifd		# ATAPI floppy drives
 #device		atapist		# ATAPI tape drives
 
+# SCSI Controllers
+device		ahc		# AHA2940 and onboard AIC7xxx devices
+options 	AHC_ALLOW_MEMIO	# Attempt to use memory mapped I/O
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
+device		isp		# Qlogic family
+device		ispfw		# Firmware module for Qlogic host adapters
+device		mpt		# LSI-Logic MPT-Fusion
+device		sym		# NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
+
 # SCSI peripherals
 device		scbus		# SCSI bus (required for SCSI)
 device		da		# Direct Access (disks)
@@ -119,6 +129,7 @@ device		md		# Memory "disks"
 device		ofwd		# Open Firmware disks
 device		gif		# IPv6 and IPv4 tunneling
 device		faith		# IPv6-to-IPv4 relaying/(translation)
+device		firmware	# firmware assist module
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!