From 877c97e5bd80e0efb16e6438950f14acfabdba69 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 1 Sep 2014 03:49:21 +0000 Subject: [PATCH] Resync comments about scbus and pass for life after AHCI joined CAM. Sponsored by: Netflix --- sys/arm/conf/BEAGLEBONE | 2 +- sys/arm/conf/CNS11XXNAS | 2 +- sys/arm/conf/CUBIEBOARD | 2 +- sys/arm/conf/CUBIEBOARD2 | 2 +- sys/arm/conf/DIGI-CCWMX53 | 4 ++-- sys/arm/conf/EB9200 | 4 ++-- sys/arm/conf/EFIKA_MX | 4 ++-- sys/arm/conf/EXYNOS5.common | 2 +- sys/arm/conf/HL200 | 4 ++-- sys/arm/conf/HL201 | 4 ++-- sys/arm/conf/IMX53-QSB | 4 ++-- sys/arm/conf/IMX6 | 4 ++-- sys/arm/conf/KB920X | 4 ++-- sys/arm/conf/NSLU | 2 +- sys/arm/conf/PANDABOARD | 2 +- sys/arm/conf/QILA9G20 | 4 ++-- sys/arm/conf/RK3188 | 2 +- sys/arm/conf/SAM9G20EK | 4 ++-- sys/arm/conf/SAM9X25EK | 4 ++-- sys/arm/conf/SN9G45 | 4 ++-- sys/arm/conf/VYBRID | 2 +- sys/arm/conf/ZEDBOARD | 2 +- 22 files changed, 34 insertions(+), 34 deletions(-) diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE index 43c49553788a..ec515f12e471 100644 --- a/sys/arm/conf/BEAGLEBONE +++ b/sys/arm/conf/BEAGLEBONE @@ -116,7 +116,7 @@ options USB_DEBUG #options USB_VERBOSE device musb device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) # Ethernet diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS index a93adadddde5..53640ffe0ac2 100644 --- a/sys/arm/conf/CNS11XXNAS +++ b/sys/arm/conf/CNS11XXNAS @@ -111,7 +111,7 @@ device usb device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass device cfi diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD index 27447aa6d92a..a0b318eaf0b5 100644 --- a/sys/arm/conf/CUBIEBOARD +++ b/sys/arm/conf/CUBIEBOARD @@ -104,7 +104,7 @@ device random # Entropy device # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2 index 1d5a7650d021..1c5184c431d4 100644 --- a/sys/arm/conf/CUBIEBOARD2 +++ b/sys/arm/conf/CUBIEBOARD2 @@ -104,7 +104,7 @@ device random # Entropy device # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53 index 9ec65a38156c..26bcb72b7253 100644 --- a/sys/arm/conf/DIGI-CCWMX53 +++ b/sys/arm/conf/DIGI-CCWMX53 @@ -130,10 +130,10 @@ device iic device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200 index 3e3d124501fe..49f06762635f 100644 --- a/sys/arm/conf/EB9200 +++ b/sys/arm/conf/EB9200 @@ -102,10 +102,10 @@ device ohci # OHCI localbus->USB interface device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB device (gadget) support #device at91_dci # Atmel's usb device diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index 826b3c7a536e..21bc0fe50ec2 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -126,10 +126,10 @@ device iic device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common index 164058bc23b1..89e978ba5e87 100644 --- a/sys/arm/conf/EXYNOS5.common +++ b/sys/arm/conf/EXYNOS5.common @@ -104,7 +104,7 @@ device ehci device xhci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200 index 8e0d174512ef..6c8140e1e5dc 100644 --- a/sys/arm/conf/HL200 +++ b/sys/arm/conf/HL200 @@ -132,10 +132,10 @@ device uath # Atheros AR5523 wireless NICs device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201 index df5d53de52b1..efdea82f489e 100644 --- a/sys/arm/conf/HL201 +++ b/sys/arm/conf/HL201 @@ -116,10 +116,10 @@ device miibus #device ural # Ralink Technology RT2500USB wireless NICs #device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards #device wlan # 802.11 support #device wlan_wep # 802.11 WEP support diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB index dd7b9a1af114..0a0b212936d7 100644 --- a/sys/arm/conf/IMX53-QSB +++ b/sys/arm/conf/IMX53-QSB @@ -129,10 +129,10 @@ device iic device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index 9b53426d3d52..ed792a250907 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -94,10 +94,10 @@ device mmc # SD/MMC protocol device mmcsd # SDCard disk device # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support #options USB_DEBUG # enable debug msgs diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X index a758a66e4e6d..eb05d003770d 100644 --- a/sys/arm/conf/KB920X +++ b/sys/arm/conf/KB920X @@ -132,10 +132,10 @@ device uath # Atheros AR5523 wireless NICs device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU index e54e63b72568..4f40c46451d2 100644 --- a/sys/arm/conf/NSLU +++ b/sys/arm/conf/NSLU @@ -115,5 +115,5 @@ options USB_DEBUG device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index 473b47138d7e..5f0dccd06fc5 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -122,7 +122,7 @@ options USB_DEBUG device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) # Ethernet diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20 index 257e37d34f5a..39873f773bae 100644 --- a/sys/arm/conf/QILA9G20 +++ b/sys/arm/conf/QILA9G20 @@ -117,10 +117,10 @@ device iicbus device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188 index e321f2ab66fe..d6a26ddf196f 100644 --- a/sys/arm/conf/RK3188 +++ b/sys/arm/conf/RK3188 @@ -88,7 +88,7 @@ device random # Entropy device # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK index 3c29f355cff8..b37a52cfbfc0 100644 --- a/sys/arm/conf/SAM9G20EK +++ b/sys/arm/conf/SAM9G20EK @@ -119,10 +119,10 @@ device iicbus device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK index d4b6343d9777..e3f5933299d9 100644 --- a/sys/arm/conf/SAM9X25EK +++ b/sys/arm/conf/SAM9X25EK @@ -118,10 +118,10 @@ device iicbus device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support #device ohci # OHCI localbus->USB interface diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45 index 3eb646bbeeb4..2f4fa99b123e 100644 --- a/sys/arm/conf/SN9G45 +++ b/sys/arm/conf/SN9G45 @@ -95,10 +95,10 @@ option AT91_ATE_USE_RMII device at91_wdt # WDT: Watchdog timer # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID index 510f9b4976a0..e2e1defa4ec3 100644 --- a/sys/arm/conf/VYBRID +++ b/sys/arm/conf/VYBRID @@ -112,7 +112,7 @@ device ehci #device ohci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD index 9b079af359f4..ab7daa294e92 100644 --- a/sys/arm/conf/ZEDBOARD +++ b/sys/arm/conf/ZEDBOARD @@ -91,7 +91,7 @@ options USB_DEBUG #options USB_VERBOSE device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device axe # USB-Ethernet