summaryrefslogtreecommitdiffstats
path: root/sys/pc98
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/pc98
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/pc98')
-rw-r--r--sys/pc98/conf/GENERIC19
1 files changed, 9 insertions, 10 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 915d73f..afe5173 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -87,13 +87,12 @@ device pci
# Floppy drives
device fdc
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+# 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 adv # Advansys SCSI adapters
@@ -110,13 +109,13 @@ device ncv # NCR 53C500
device nsp # Workbit Ninja SCSI-3
device stg # TMC 18C30/18C50
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device ch # SCSI media changers
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
device ses # SCSI Environmental Services (and SAF-TE)
# keyboard driver
OpenPOWER on IntegriCloud