Author: imp
Date: Mon Sep  1 03:49:21 2014
New Revision: 270912
URL: http://svnweb.freebsd.org/changeset/base/270912

Log:
  Resync comments about scbus and pass for life after AHCI joined CAM.
  
  Sponsored by: Netflix

Modified:
  head/sys/arm/conf/BEAGLEBONE
  head/sys/arm/conf/CNS11XXNAS
  head/sys/arm/conf/CUBIEBOARD
  head/sys/arm/conf/CUBIEBOARD2
  head/sys/arm/conf/DIGI-CCWMX53
  head/sys/arm/conf/EB9200
  head/sys/arm/conf/EFIKA_MX
  head/sys/arm/conf/EXYNOS5.common
  head/sys/arm/conf/HL200
  head/sys/arm/conf/HL201
  head/sys/arm/conf/IMX53-QSB
  head/sys/arm/conf/IMX6
  head/sys/arm/conf/KB920X
  head/sys/arm/conf/NSLU
  head/sys/arm/conf/PANDABOARD
  head/sys/arm/conf/QILA9G20
  head/sys/arm/conf/RK3188
  head/sys/arm/conf/SAM9G20EK
  head/sys/arm/conf/SAM9X25EK
  head/sys/arm/conf/SN9G45
  head/sys/arm/conf/VYBRID
  head/sys/arm/conf/ZEDBOARD

Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE        Mon Sep  1 03:22:47 2014        
(r270911)
+++ head/sys/arm/conf/BEAGLEBONE        Mon Sep  1 03:49:21 2014        
(r270912)
@@ -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

Modified: head/sys/arm/conf/CNS11XXNAS
==============================================================================
--- head/sys/arm/conf/CNS11XXNAS        Mon Sep  1 03:22:47 2014        
(r270911)
+++ head/sys/arm/conf/CNS11XXNAS        Mon Sep  1 03:49:21 2014        
(r270912)
@@ -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

Modified: head/sys/arm/conf/CUBIEBOARD
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD        Mon Sep  1 03:22:47 2014        
(r270911)
+++ head/sys/arm/conf/CUBIEBOARD        Mon Sep  1 03:49:21 2014        
(r270912)
@@ -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
 

Modified: head/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD2       Mon Sep  1 03:22:47 2014        
(r270911)
+++ head/sys/arm/conf/CUBIEBOARD2       Mon Sep  1 03:49:21 2014        
(r270912)
@@ -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
 

Modified: head/sys/arm/conf/DIGI-CCWMX53
==============================================================================
--- head/sys/arm/conf/DIGI-CCWMX53      Mon Sep  1 03:22:47 2014        
(r270911)
+++ head/sys/arm/conf/DIGI-CCWMX53      Mon Sep  1 03:49:21 2014        
(r270912)
@@ -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.

Modified: head/sys/arm/conf/EB9200
==============================================================================
--- head/sys/arm/conf/EB9200    Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/EB9200    Mon Sep  1 03:49:21 2014        (r270912)
@@ -102,10 +102,10 @@ device            ohci                    # OHCI 
localbus->USB inte
 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

Modified: head/sys/arm/conf/EFIKA_MX
==============================================================================
--- head/sys/arm/conf/EFIKA_MX  Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/EFIKA_MX  Mon Sep  1 03:49:21 2014        (r270912)
@@ -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.

Modified: head/sys/arm/conf/EXYNOS5.common
==============================================================================
--- head/sys/arm/conf/EXYNOS5.common    Mon Sep  1 03:22:47 2014        
(r270911)
+++ head/sys/arm/conf/EXYNOS5.common    Mon Sep  1 03:49:21 2014        
(r270912)
@@ -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
 

Modified: head/sys/arm/conf/HL200
==============================================================================
--- head/sys/arm/conf/HL200     Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/HL200     Mon Sep  1 03:49:21 2014        (r270912)
@@ -132,10 +132,10 @@ device            uath                    # Atheros 
AR5523 wireless
 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

Modified: head/sys/arm/conf/HL201
==============================================================================
--- head/sys/arm/conf/HL201     Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/HL201     Mon Sep  1 03:49:21 2014        (r270912)
@@ -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

Modified: head/sys/arm/conf/IMX53-QSB
==============================================================================
--- head/sys/arm/conf/IMX53-QSB Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/IMX53-QSB Mon Sep  1 03:49:21 2014        (r270912)
@@ -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.

Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6      Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/IMX6      Mon Sep  1 03:49:21 2014        (r270912)
@@ -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

Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X    Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/KB920X    Mon Sep  1 03:49:21 2014        (r270912)
@@ -132,10 +132,10 @@ device            uath                    # Atheros 
AR5523 wireless
 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

Modified: head/sys/arm/conf/NSLU
==============================================================================
--- head/sys/arm/conf/NSLU      Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/NSLU      Mon Sep  1 03:49:21 2014        (r270912)
@@ -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)

Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD        Mon Sep  1 03:22:47 2014        
(r270911)
+++ head/sys/arm/conf/PANDABOARD        Mon Sep  1 03:49:21 2014        
(r270912)
@@ -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

Modified: head/sys/arm/conf/QILA9G20
==============================================================================
--- head/sys/arm/conf/QILA9G20  Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/QILA9G20  Mon Sep  1 03:49:21 2014        (r270912)
@@ -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

Modified: head/sys/arm/conf/RK3188
==============================================================================
--- head/sys/arm/conf/RK3188    Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/RK3188    Mon Sep  1 03:49:21 2014        (r270912)
@@ -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
 

Modified: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/SAM9G20EK Mon Sep  1 03:49:21 2014        (r270912)
@@ -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

Modified: head/sys/arm/conf/SAM9X25EK
==============================================================================
--- head/sys/arm/conf/SAM9X25EK Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/SAM9X25EK Mon Sep  1 03:49:21 2014        (r270912)
@@ -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

Modified: head/sys/arm/conf/SN9G45
==============================================================================
--- head/sys/arm/conf/SN9G45    Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/SN9G45    Mon Sep  1 03:49:21 2014        (r270912)
@@ -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

Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID    Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/VYBRID    Mon Sep  1 03:49:21 2014        (r270912)
@@ -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
 

Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD  Mon Sep  1 03:22:47 2014        (r270911)
+++ head/sys/arm/conf/ZEDBOARD  Mon Sep  1 03:49:21 2014        (r270912)
@@ -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
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to