summaryrefslogtreecommitdiffstats
path: root/sys/ia64/conf
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2011-04-24 08:58:58 +0000
committermav <mav@FreeBSD.org>2011-04-24 08:58:58 +0000
commit512a6cd715d527dbecfe273cd4d9de5adbff4aca (patch)
tree5eb3abfbf0e6e6408274205060fa7b1e7626359f /sys/ia64/conf
parent57afc00cc3c5af4b41a69378c73122d0901df53f (diff)
downloadFreeBSD-src-512a6cd715d527dbecfe273cd4d9de5adbff4aca.zip
FreeBSD-src-512a6cd715d527dbecfe273cd4d9de5adbff4aca.tar.gz
Switch the GENERIC kernels for all architectures to the new CAM-based ATA
stack. It means that all legacy ATA drivers are disabled and replaced by respective CAM drivers. If you are using ATA device names in /etc/fstab or other places, make sure to update them respectively (adX -> adaY, acdX -> cdY, afdX -> daY, astX -> saY, where 'Y's are the sequential numbers for each type in order of detection, unless configured otherwise with tunables, see cam(4)). ataraid(4) functionality is now supported by the RAID GEOM class. To use it you can load geom_raid kernel module and use graid(8) tool for management. Instead of /dev/arX device names, use /dev/raid/rX.
Diffstat (limited to 'sys/ia64/conf')
-rw-r--r--sys/ia64/conf/GENERIC19
1 files changed, 9 insertions, 10 deletions
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 6c3c6a7..9efa94d5 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -73,16 +73,15 @@ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
device firewire # FireWire bus code
device miibus # MII bus support (Ethernet)
device pci # PCI bus support
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device usb # USB Bus (required for USB)
-# ATA and ATAPI devices
-device ata # ATA controller
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-device ataraid # ATA RAID drives
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device ahc # AHA2940 and AIC7xxx devices
@@ -101,11 +100,11 @@ device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
device twa # 3ware 9000 series PATA/SATA RAID
-# SCSI peripherals
+# ATA/SCSI peripherals
device cd # CD-ROM, DVD-ROM etc.
device ch # Media changer
device da # Direct Access (ie disk)
-device pass # Passthrough (direct SCSI access)
+device pass # Passthrough (direct ATA/SCSI access)
device sa # Sequential Access (ie tape)
device ses # Environmental Services (and SAF-TE)
OpenPOWER on IntegriCloud