Diff for /elwix/config/ELWIX_i386 between versions 1.5 and 1.6

version 1.5, 2014/09/15 19:06:42 version 1.6, 2017/02/13 16:52:46
Line 1 Line 1
 # $Id$  # $Id$
# $FreeBSD: head/sys/i386/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $# $FreeBSD: head/sys/i386/conf/GENERIC 310177 2016-12-16 21:10:37Z jhb $
   
 cpu             I486_CPU  cpu             I486_CPU
 cpu             I586_CPU  cpu             I586_CPU
Line 19  options  SCHED_ULE  # ULE scheduler Line 19  options  SCHED_ULE  # ULE scheduler
 options         PREEMPTION              # Enable kernel thread preemption  options         PREEMPTION              # Enable kernel thread preemption
 options         INET                    # InterNETworking  options         INET                    # InterNETworking
 options         INET6                   # IPv6 communications protocols  options         INET6                   # IPv6 communications protocols
   options         IPSEC                   # IP (v4/v6) security
   options         TCP_HHOOK               # hhook(9) framework for TCP
 options         TCP_OFFLOAD             # TCP offload  options         TCP_OFFLOAD             # TCP offload
 options         SCTP                    # Stream Control Transmission Protocol  options         SCTP                    # Stream Control Transmission Protocol
 options         FFS                     # Berkeley Fast Filesystem  options         FFS                     # Berkeley Fast Filesystem
Line 28  options  UFS_DIRHASH  # Improve performance on big dir Line 30  options  UFS_DIRHASH  # Improve performance on big dir
 options         UFS_GJOURNAL            # Enable gjournal-based UFS journaling  options         UFS_GJOURNAL            # Enable gjournal-based UFS journaling
 options         QUOTA                   # Enable disk quotas for UFS  options         QUOTA                   # Enable disk quotas for UFS
 options         MD_ROOT                 # MD is a potential root device  options         MD_ROOT                 # MD is a potential root device
options         NFSCL                   # New Network Filesystem Clientoptions         NFSCL                   # Network Filesystem Client
options         NFSD                    # New Network Filesystem Serveroptions         NFSD                    # Network Filesystem Server
 options         NFSLOCKD                # Network Lock Manager  options         NFSLOCKD                # Network Lock Manager
 options         NFS_ROOT                # NFS usable as /, requires NFSCL  options         NFS_ROOT                # NFS usable as /, requires NFSCL
 options         MSDOSFS                 # MSDOS Filesystem  options         MSDOSFS                 # MSDOS Filesystem
Line 39  options  PSEUDOFS  # Pseudo-filesystem framework Line 41  options  PSEUDOFS  # Pseudo-filesystem framework
 options         GEOM_PART_GPT           # GUID Partition Tables.  options         GEOM_PART_GPT           # GUID Partition Tables.
 options         GEOM_RAID               # Soft RAID functionality.  options         GEOM_RAID               # Soft RAID functionality.
 options         GEOM_LABEL              # Provides labelization  options         GEOM_LABEL              # Provides labelization
options         GEOM_GATE#options         GEOM_GATE
 options         GEOM_MAP
 options         GEOM_UZIP  options         GEOM_UZIP
 #device         geom_redboot  #device         geom_redboot
 device          geom_map        # to get access to the SPI flash partitions  device          geom_map        # to get access to the SPI flash partitions
#device         geom_uncompress # compressed in-memory filesystem hackery!device          geom_uzip       # compressed in-memory filesystem support
#device          geom_uzip       # compressed in-memory filesystem support 
options         GEOM_UNCOMPRESS 
 options         GEOM_ELI  options         GEOM_ELI
 options         GEOM_MIRROR  options         GEOM_MIRROR
 options         GEOM_CONCAT  options         GEOM_CONCAT
Line 53  options  GEOM_STRIPE Line 54  options  GEOM_STRIPE
 options         GEOM_VIRSTOR  options         GEOM_VIRSTOR
 options         GEOM_CACHE  options         GEOM_CACHE
 options         GEOM_MULTIPATH  options         GEOM_MULTIPATH
options         GEOM_LINUX_LVM          # Linux LVM2 volumes#options         GEOM_LINUX_LVM          # Linux LVM2 volumes
 options         COMPAT_43TTY            # BSD 4.3 TTY compat (sgtty)  options         COMPAT_43TTY            # BSD 4.3 TTY compat (sgtty)
 options         COMPAT_FREEBSD4         # Compatible with FreeBSD4  options         COMPAT_FREEBSD4         # Compatible with FreeBSD4
 options         COMPAT_FREEBSD5         # Compatible with FreeBSD5  options         COMPAT_FREEBSD5         # Compatible with FreeBSD5
 options         COMPAT_FREEBSD6         # Compatible with FreeBSD6  options         COMPAT_FREEBSD6         # Compatible with FreeBSD6
 options         COMPAT_FREEBSD7         # Compatible with FreeBSD7  options         COMPAT_FREEBSD7         # Compatible with FreeBSD7
   options         COMPAT_FREEBSD9         # Compatible with FreeBSD9
   options         COMPAT_FREEBSD10        # Compatible with FreeBSD10
   options         COMPAT_FREEBSD11        # Compatible with FreeBSD11
 options         SCSI_DELAY=5000         # Delay (in ms) before probing SCSI  options         SCSI_DELAY=5000         # Delay (in ms) before probing SCSI
 options         KTRACE                  # ktrace(1) support  options         KTRACE                  # ktrace(1) support
 options         STACK                   # stack(9) support  options         STACK                   # stack(9) support
Line 77  options  CAPABILITIES  # Capsicum capabilities Line 81  options  CAPABILITIES  # Capsicum capabilities
 options         MAC                     # TrustedBSD MAC Framework  options         MAC                     # TrustedBSD MAC Framework
 #options        KDTRACE_HOOKS           # Kernel DTrace hooks  #options        KDTRACE_HOOKS           # Kernel DTrace hooks
 #options        DDB_CTF                 # Kernel ELF linker loads CTF data  #options        DDB_CTF                 # Kernel ELF linker loads CTF data
   options         INCLUDE_CONFIG_FILE     # Include this file in kernel
 options         FLOWTABLE               # per-cpu routing cache  options         FLOWTABLE               # per-cpu routing cache
options         INCLUDE_CONFIG_FILE     # Include this file in kerneloptions         RACCT                   # Resource accounting framework
 options         RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
 options         RCTL                    # Resource limits
   
 # Debugging support.  Always need this:  # Debugging support.  Always need this:
 #options        KDB                     # Enable kernel debugger support.  #options        KDB                     # Enable kernel debugger support.
Line 103  device  cpufreq Line 110  device  cpufreq
 # Bus support.  # Bus support.
 device          acpi  device          acpi
 device          pci  device          pci
   options         PCI_HP                  # PCI-Express native HotPlug
   options         PCI_IOV                 # PCI SR-IOV support
   
 # Floppy drives  # Floppy drives
 device          fdc  device          fdc
   
 # ATA controllers  # ATA controllers
device          ahci            # AHCI-compatible SATA controllersdevice          ahci                    # AHCI-compatible SATA controllers
device          ata             # Legacy ATA/SATA controllersdevice          ata                     # Legacy ATA/SATA controllers
options         ATA_STATIC_ID   # Static device numberingdevice          mvs                     # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
device          mvs             # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATAdevice          siis                    # SiliconImage SiI3124/SiI3132/SiI3531 SATA
device          siis            # SiliconImage SiI3124/SiI3132/SiI3531 SATA 
   
 # SCSI Controllers  # SCSI Controllers
device          ahc             # AHA2940 and onboard AIC7xxx devicesdevice          ahc                     # AHA2940 and onboard AIC7xxx devices
 options         AHC_REG_PRETTY_PRINT    # Print register bitfields in debug  options         AHC_REG_PRETTY_PRINT    # Print register bitfields in debug
                                         # output.  Adds ~128k to driver.                                          # output.  Adds ~128k to driver.
device          ahd             # AHA39320/29320 and onboard AIC79xx devicesdevice          ahd                     # AHA39320/29320 and onboard AIC79xx devices
 options         AHD_REG_PRETTY_PRINT    # Print register bitfields in debug  options         AHD_REG_PRETTY_PRINT    # Print register bitfields in debug
                                         # output.  Adds ~215k to driver.                                          # output.  Adds ~215k to driver.
device          esp             # AMD Am53C974 (Tekram DC-390(T))device          esp                     # AMD Am53C974 (Tekram DC-390(T))
device          hptiop          # Highpoint RocketRaid 3xxx seriesdevice          hptiop                  # Highpoint RocketRaid 3xxx series
device          isp             # Qlogic familydevice          isp                     # Qlogic family
#device         ispfw           # Firmware for QLogic HBAs- normally a module#device         ispfw                   # Firmware for QLogic HBAs- normally a module
device          mpt             # LSI-Logic MPT-Fusiondevice          mpt                     # LSI-Logic MPT-Fusion
device          mps             # LSI-Logic MPT-Fusion 2device          mps                     # LSI-Logic MPT-Fusion 2
device          mpr             # LSI-Logic MPT-Fusion 3device          mpr                     # LSI-Logic MPT-Fusion 3
#device         ncr             # NCR/Symbios Logic#device         ncr                     # NCR/Symbios Logic
device          sym             # NCR/Symbios Logic (newer chipsets + those of `ncr')device          sym                     # NCR/Symbios Logic (newer chipsets + those of `ncr')
device          trm             # Tekram DC395U/UW/F DC315U adaptersdevice          trm                     # Tekram DC395U/UW/F DC315U adapters
   
device          adv             # Advansys SCSI adaptersdevice          adv                     # Advansys SCSI adapters
device          adw             # Advansys wide SCSI adaptersdevice          adw                     # Advansys wide SCSI adapters
device          aha             # Adaptec 154x SCSI adaptersdevice          aha                     # Adaptec 154x SCSI adapters
device          aic             # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.device          aic                     # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device          bt              # Buslogic/Mylex MultiMaster SCSI adaptersdevice          bt                      # Buslogic/Mylex MultiMaster SCSI adapters
   
device          ncv             # NCR 53C500device          ncv                     # NCR 53C500
device          nsp             # Workbit Ninja SCSI-3device          nsp                     # Workbit Ninja SCSI-3
device          stg             # TMC 18C30/18C50device          stg                     # TMC 18C30/18C50
device          isci            # Intel C600 SAS controllerdevice          isci                    # Intel C600 SAS controller
   
 # ATA/SCSI peripherals  # ATA/SCSI peripherals
device          scbus           # SCSI bus (required for ATA/SCSI)device          scbus                   # SCSI bus (required for ATA/SCSI)
device          ch              # SCSI media changersdevice          ch                      # SCSI media changers
device          da              # Direct Access (disks)device          da                      # Direct Access (disks)
device          sa              # Sequential Access (tape etc)device          sa                      # Sequential Access (tape etc)
device          cd              # CDdevice          cd                      # CD
device          pass            # Passthrough device (direct ATA/SCSI access)device          pass                    # Passthrough device (direct ATA/SCSI access)
device          ses             # Enclosure Services (SES and SAF-TE)device          ses                     # Enclosure Services (SES and SAF-TE)
#device         ctl             # CAM Target Layer#device         ctl                     # CAM Target Layer
   
 # RAID controllers interfaced to the SCSI subsystem  # RAID controllers interfaced to the SCSI subsystem
device          amr             # AMI MegaRAIDdevice          amr                     # AMI MegaRAID
device          arcmsr          # Areca SATA II RAIDdevice          arcmsr                  # Areca SATA II RAID
device          asr             # DPT SmartRAID V, VI and Adaptec SCSI RAIDdevice          ciss                    # Compaq Smart RAID 5*
device                ciss            # Compaq Smart RAID 5*device          dpt                     # DPT Smartcache III, IV - See NOTES for options
device          dpt             # DPT Smartcache III, IV - See NOTES for optionsdevice          hptmv                   # Highpoint RocketRAID 182x
device          hptmv           # Highpoint RocketRAID 182xdevice          hptnr                   # Highpoint DC7280, R750
device          hptnr           # Highpoint DC7280, R750device          hptrr                   # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
device          hptrr           # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xxdevice          hpt27xx                 # Highpoint RocketRAID 27xx
device          hpt27xx         # Highpoint RocketRAID 27xxdevice          iir                     # Intel Integrated RAID
device          iir             # Intel Integrated RAIDdevice          ips                     # IBM (Adaptec) ServeRAID
device          ips             # IBM (Adaptec) ServeRAIDdevice          mly                     # Mylex AcceleRAID/eXtremeRAID
device          mly             # Mylex AcceleRAID/eXtremeRAIDdevice          twa                     # 3ware 9000 series PATA/SATA RAID
device          twa             # 3ware 9000 series PATA/SATA RAIDdevice          tws                     # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
device          tws             # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller 
   
 # RAID controllers  # RAID controllers
device          aac             # Adaptec FSA RAIDdevice          aac                     # Adaptec FSA RAID
device          aacp            # SCSI passthrough for aac (requires CAM)device          aacp                    # SCSI passthrough for aac (requires CAM)
device          aacraid         # Adaptec by PMC RAIDdevice          aacraid                 # Adaptec by PMC RAID
device          ida             # Compaq Smart RAIDdevice          ida                     # Compaq Smart RAID
device          mfi             # LSI MegaRAID SASdevice          mfi                     # LSI MegaRAID SAS
device          mlx             # Mylex DAC960 familydevice          mlx                     # Mylex DAC960 family
device          mrsas           # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/sdevice          mrsas                   # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
device          pst                # Promise Supertrak SX6000device          pmspcv                   # PMC-Sierra SAS/SATA Controller driver
device          twe             # 3ware ATA RAIDdevice          pst                     # Promise Supertrak SX6000
 device          twe                     # 3ware ATA RAID
   
   # NVM Express (NVMe) support
   device          nvme                    # base NVMe driver
   device          nvd                     # expose NVMe namespace as disks, depends on nvme
   
 # atkbdc0 controls both the keyboard and the PS/2 mouse  # atkbdc0 controls both the keyboard and the PS/2 mouse
device          atkbdc          # AT keyboard controllerdevice          atkbdc                  # AT keyboard controller
device          atkbd           # AT keyboarddevice          atkbd                   # AT keyboard
device          psm             # PS/2 mousedevice          psm                     # PS/2 mouse
   
device          kbdmux          # keyboard multiplexerdevice          kbdmux                  # keyboard multiplexer
   
device          vga             # VGA video card driverdevice          vga                     # VGA video card driver
options         VESA            # Add support for VESA BIOS Extensions (VBE)options         VESA                    # Add support for VESA BIOS Extensions (VBE)
   
device          splash          # Splash screen and screen saver supportdevice          splash                  # Splash screen and screen saver support
   
 # syscons is the default console driver, resembling an SCO console  # syscons is the default console driver, resembling an SCO console
 device          sc  device          sc
options         SC_PIXEL_MODE   # add support for the raster text modeoptions         SC_PIXEL_MODE           # add support for the raster text mode
   
 # vt is the new video console driver  # vt is the new video console driver
 device          vt  device          vt
Line 209  device  pmtimer Line 221  device  pmtimer
   
 # PCCARD (PCMCIA) support  # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support  # PCMCIA and cardbus bridge support
device          cbb             # cardbus (yenta) bridgedevice          cbb                     # cardbus (yenta) bridge
device          pccard          # PC Card (16-bit) busdevice          pccard                  # PC Card (16-bit) bus
device          cardbus         # CardBus (32-bit) busdevice          cardbus                 # CardBus (32-bit) bus
   
 # Serial (COM) ports  # Serial (COM) ports
device          uart            # Generic UART driverdevice          uart                    # Generic UART driver
   
 # Parallel port  # Parallel port
 device          ppc  device          ppc
device          ppbus           # Parallel port bus (required)device          ppbus                   # Parallel port bus (required)
device          lpt             # Printerdevice          lpt                     # Printer
device          ppi             # Parallel port interface devicedevice          ppi                     # Parallel port interface device
#device         vpo             # Requires scbus and da#device         vpo                     # Requires scbus and da
   
device          puc             # Multi I/O cards and multi-channel UARTsdevice          puc                     # Multi I/O cards and multi-channel UARTs
   
 # PCI Ethernet NICs.  # PCI Ethernet NICs.
device          bxe             # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbEdevice          bxe                     # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
device          de              # DEC/Intel DC21x4x (``Tulip'')device          de                      # DEC/Intel DC21x4x (``Tulip'')
device          em              # Intel PRO/1000 Gigabit Ethernet Familydevice          em                      # Intel PRO/1000 Gigabit Ethernet Family
device          igb             # Intel PRO/1000 PCIE Server Gigabit Familydevice          igb                     # Intel PRO/1000 PCIE Server Gigabit Family
device          ixgb            # Intel PRO/10GbE Ethernet Carddevice          ixgb                    # Intel PRO/10GbE Ethernet Card
device          le              # AMD Am7900 LANCE and Am79C9xx PCnetdevice          le                      # AMD Am7900 LANCE and Am79C9xx PCnet
device          ti              # Alteon Networks Tigon I/II gigabit Ethernetdevice          ti                      # Alteon Networks Tigon I/II gigabit Ethernet
device          txp             # 3Com 3cR990 (``Typhoon'')device          txp                     # 3Com 3cR990 (``Typhoon'')
device          vx              # 3Com 3c590, 3c595 (``Vortex'')device          vx                      # 3Com 3c590, 3c595 (``Vortex'')
 #device         vxge            # Exar/Neterion XFrame 3100 10GbE  #device         vxge            # Exar/Neterion XFrame 3100 10GbE
 #device         mxge            # Myricom Myri-10G 10GbE NIC  #device         mxge            # Myricom Myri-10G 10GbE NIC
 #device         nxge            # Neterion Xframe 10GbE Server/Storage Adapter  #device         nxge            # Neterion Xframe 10GbE Server/Storage Adapter
Line 246  device  vx  # 3Com 3c590, 3c595 (``Vortex'') Line 258  device  vx  # 3Com 3c590, 3c595 (``Vortex'')
   
 # PCI Ethernet NICs that use the common MII bus controller code.  # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!  # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device          miibus          # MII bus supportdevice          miibus                  # MII bus support
device          ae              # Attansic/Atheros L2 FastEthernetdevice          ae                      # Attansic/Atheros L2 FastEthernet
device          age             # Attansic/Atheros L1 Gigabit Ethernetdevice          age                     # Attansic/Atheros L1 Gigabit Ethernet
device          alc             # Atheros AR8131/AR8132 Ethernetdevice          alc                     # Atheros AR8131/AR8132 Ethernet
device          ale             # Atheros AR8121/AR8113/AR8114 Ethernetdevice          ale                     # Atheros AR8121/AR8113/AR8114 Ethernet
device          bce             # Broadcom BCM5706/BCM5708 Gigabit Ethernetdevice          bce                     # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device          bfe             # Broadcom BCM440x 10/100 Ethernetdevice          bfe                     # Broadcom BCM440x 10/100 Ethernet
device          bge             # Broadcom BCM570xx Gigabit Ethernetdevice          bge                     # Broadcom BCM570xx Gigabit Ethernet
#device         cas             # Sun Cassini/Cassini+ and NS DP83065 Saturn#device         cas                     # Sun Cassini/Cassini+ and NS DP83065 Saturn
device          dc              # DEC/Intel 21143 and various workalikesdevice          dc                      # DEC/Intel 21143 and various workalikes
device          et              # Agere ET1310 10/100/Gigabit Ethernetdevice          et                      # Agere ET1310 10/100/Gigabit Ethernet
device          fxp             # Intel EtherExpress PRO/100B (82557, 82558)device          fxp                     # Intel EtherExpress PRO/100B (82557, 82558)
#device         gem             # Sun GEM/Sun ERI/Apple GMAC#device         gem                     # Sun GEM/Sun ERI/Apple GMAC
#device         hme             # Sun HME (Happy Meal Ethernet)#device         hme                     # Sun HME (Happy Meal Ethernet)
device          jme             # JMicron JMC250 Gigabit/JMC260 Fast Ethernetdevice          jme                     # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device          lge             # Level 1 LXT1001 gigabit Ethernetdevice          lge                     # Level 1 LXT1001 gigabit Ethernet
device          msk             # Marvell/SysKonnect Yukon II Gigabit Ethernetdevice          msk                     # Marvell/SysKonnect Yukon II Gigabit Ethernet
device          nfe             # nVidia nForce MCP on-board Ethernetdevice          nfe                     # nVidia nForce MCP on-board Ethernet
device          nge             # NatSemi DP83820 gigabit Ethernetdevice          nge                     # NatSemi DP83820 gigabit Ethernet
device          pcn             # AMD Am79C97x PCI 10/100 (precedence over 'le')device          pcn                     # AMD Am79C97x PCI 10/100 (precedence over 'le')
device          re              # RealTek 8139C+/8169/8169S/8110Sdevice          re                      # RealTek 8139C+/8169/8169S/8110S
device          rl              # RealTek 8129/8139device          rl                      # RealTek 8129/8139
device          sf              # Adaptec AIC-6915 (``Starfire'')device          sf                      # Adaptec AIC-6915 (``Starfire'')
device          sge             # Silicon Integrated Systems SiS190/191device          sge                     # Silicon Integrated Systems SiS190/191
device          sis             # Silicon Integrated Systems SiS 900/SiS 7016device          sis                     # Silicon Integrated Systems SiS 900/SiS 7016
device          sk              # SysKonnect SK-984x & SK-982x gigabit Ethernetdevice          sk                      # SysKonnect SK-984x & SK-982x gigabit Ethernet
device          ste             # Sundance ST201 (D-Link DFE-550TX)device          ste                     # Sundance ST201 (D-Link DFE-550TX)
device          stge            # Sundance/Tamarack TC9021 gigabit Ethernetdevice          stge                    # Sundance/Tamarack TC9021 gigabit Ethernet
device          tl              # Texas Instruments ThunderLANdevice          tl                      # Texas Instruments ThunderLAN
device          tx              # SMC EtherPower II (83c170 ``EPIC'')device          tx                      # SMC EtherPower II (83c170 ``EPIC'')
device          vge             # VIA VT612x gigabit Ethernetdevice          vge                     # VIA VT612x gigabit Ethernet
device          vr              # VIA Rhine, Rhine IIdevice          vr                      # VIA Rhine, Rhine II
device          vte             # DM&P Vortex86 RDC R6040 Fast Ethernetdevice          vte                     # DM&P Vortex86 RDC R6040 Fast Ethernet
device          wb              # Winbond W89C840Fdevice          wb                      # Winbond W89C840F
device          xl              # 3Com 3c90x (``Boomerang'', ``Cyclone'')device          xl                      # 3Com 3c90x (``Boomerang'', ``Cyclone'')
   
 # ISA Ethernet NICs.  pccard NICs included.  # ISA Ethernet NICs.  pccard NICs included.
device          cs              # Crystal Semiconductor CS89x0 NICdevice          cs                      # Crystal Semiconductor CS89x0 NIC
 # 'device ed' requires 'device miibus'  # 'device ed' requires 'device miibus'
device          ed              # NE[12]000, SMC Ultra, 3c503, DS8390 cardsdevice          ed                      # NE[12]000, SMC Ultra, 3c503, DS8390 cards
device          ex              # Intel EtherExpress Pro/10 and Pro/10+device          ex                      # Intel EtherExpress Pro/10 and Pro/10+
device          ep              # Etherlink III based cardsdevice          ep                      # Etherlink III based cards
device          fe              # Fujitsu MB8696x based cardsdevice          fe                      # Fujitsu MB8696x based cards
device          ie              # EtherExpress 8/16, 3C507, StarLAN 10 etc.device          ie                      # EtherExpress 8/16, 3C507, StarLAN 10 etc.
device          sn              # SMC's 9000 series of Ethernet chipsdevice          sn                      # SMC's 9000 series of Ethernet chips
device          xe              # Xircom pccard Ethernetdevice          xe                      # Xircom pccard Ethernet
   
 options         XBONEHACK  options         XBONEHACK
 options         WLCACHE  
 device          wlan_acl  device          wlan_acl
 device          wlan_xauth  device          wlan_xauth
 device          wlan_rssadapt  device          wlan_rssadapt
Line 305  options  IEEE80211_ALQ Line 316  options  IEEE80211_ALQ
 options         IEEE80211_SUPPORT_TDMA  options         IEEE80211_SUPPORT_TDMA
 options         IEEE80211_SUPPORT_SUPERG  options         IEEE80211_SUPPORT_SUPERG
 # Wireless NIC cards  # Wireless NIC cards
device          wlan            # 802.11 supportdevice          wlan                    # 802.11 support
options         IEEE80211_DEBUG # enable debug msgsoptions         IEEE80211_DEBUG         # enable debug msgs
options         IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q'soptions         IEEE80211_AMPDU_AGE     # age frames in AMPDU reorder q's
 options         IEEE80211_SUPPORT_MESH  # enable 802.11s draft support  options         IEEE80211_SUPPORT_MESH  # enable 802.11s draft support
device          wlan_wep        # 802.11 WEP supportdevice          wlan_wep                # 802.11 WEP support
device          wlan_ccmp       # 802.11 CCMP supportdevice          wlan_ccmp               # 802.11 CCMP support
device          wlan_tkip       # 802.11 TKIP supportdevice          wlan_tkip               # 802.11 TKIP support
device          wlan_amrr       # AMRR transmit rate control algorithmdevice          wlan_amrr               # AMRR transmit rate control algorithm
device          an              # Aironet 4500/4800 802.11 wireless NICs.device          an                      # Aironet 4500/4800 802.11 wireless NICs.
device          ath             # Atheros NICsdevice          ath                     # Atheros NICs
device          ath_pci         # Atheros pci/cardbus gluedevice          ath_pci                 # Atheros pci/cardbus glue
device          ath_hal         # pci/cardbus chip supportdevice          ath_hal                 # pci/cardbus chip support
 options         AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors  options         AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
options         AH_AR5416_INTERRUPT_MITIGATION  # AR5416 interrupt mitigationoptions         AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation
options         ATH_ENABLE_11N  # Enable 802.11n support for AR5416 and lateroptions         ATH_ENABLE_11N          # Enable 802.11n support for AR5416 and later
device          ath_rate_sample # SampleRate tx rate control for athdevice          ath_rate_sample         # SampleRate tx rate control for ath
device          bwi             # Broadcom BCM430x/BCM431x wireless NICs.#device          bwi                     # Broadcom BCM430x/BCM431x wireless NICs.
device          bwn             # Broadcom BCM43xx wireless NICs.#device          bwn                     # Broadcom BCM43xx wireless NICs.
device          ipw             # Intel 2100 wireless NICs.device          ipw                     # Intel 2100 wireless NICs.
device          iwi             # Intel 2200BG/2225BG/2915ABG wireless NICs.device          iwi                     # Intel 2200BG/2225BG/2915ABG wireless NICs.
device          iwn             # Intel 4965/1000/5000/6000 wireless NICs.device          iwn                     # Intel 4965/1000/5000/6000 wireless NICs.
device          malo            # Marvell Libertas wireless NICs.device          malo                    # Marvell Libertas wireless NICs.
device          mwl             # Marvell 88W8363 802.11n wireless NICs.device          mwl                     # Marvell 88W8363 802.11n wireless NICs.
device          ral             # Ralink Technology RT2500 wireless NICs.device          ral                     # Ralink Technology RT2500 wireless NICs.
device          wi              # WaveLAN/Intersil/Symbol 802.11 wireless NICs.device          wi                      # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device         wl              # Older non 802.11 Wavelan wireless NIC.#device         wl                      # Older non 802.11 Wavelan wireless NIC.
device          wpi             # Intel 3945ABG wireless NICs.device          wpi                     # Intel 3945ABG wireless NICs.
   
 device          iwifw  device          iwifw
 device          ipwfw  device          ipwfw
Line 340  device  mwlfw Line 351  device  mwlfw
 device          wpifw  device          wpifw
   
 # Pseudo devices.  # Pseudo devices.
device          loop            # Network loopbackdevice          loop                    # Network loopback
device          random          # Entropy devicedevice          random                  # Entropy device
device          padlock_rng     # VIA Padlock RNGdevice          padlock_rng             # VIA Padlock RNG
device          rdrand_rng      # Intel Bull Mountain RNGdevice          rdrand_rng              # Intel Bull Mountain RNG
device          ether           # Ethernet supportdevice          ether                   # Ethernet support
device          vlan            # 802.1Q VLAN supportdevice          vlan                    # 802.1Q VLAN support
device          tun             # Packet tunnel.device          tun                     # Packet tunnel.
device          md              # Memory "disks"device          md                      # Memory "disks"
device          gif             # IPv6 and IPv4 tunnelingdevice          gif                     # IPv6 and IPv4 tunneling
device          faith            # IPv6-to-IPv4 relaying (translation)device          firmware         # firmware assist module
device          firmware # firmware assist module 
   
 # The `bpf' device enables the Berkeley Packet Filter.  # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!  # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.  # Note that 'bpf' is required for DHCP.
device          bpf             # Berkeley packet filterdevice          bpf                     # Berkeley packet filter
   
 # USB support  # USB support
#options        USB_DEBUG       # enable debug msgs#options        USB_DEBUG               # enable debug msgs
device          uhci            # UHCI PCI->USB interfacedevice          uhci                    # UHCI PCI->USB interface
device          ohci            # OHCI PCI->USB interfacedevice          ohci                    # OHCI PCI->USB interface
device          ehci            # EHCI PCI->USB interface (USB 2.0)device          ehci                    # EHCI PCI->USB interface (USB 2.0)
device          xhci            # XHCI PCI->USB interface (USB 3.0)device          xhci                    # XHCI PCI->USB interface (USB 3.0)
device          usb             # USB Bus (required)device          usb                     # USB Bus (required)
device          ukbd            # Keyboarddevice          ukbd                    # Keyboard
device          umass           # Disks/Mass storage - Requires scbus and dadevice          umass                   # Disks/Mass storage - Requires scbus and da
 # USB Serial devices  # USB Serial devices
 device          u3g             # USB-based 3G modems (Option, Huawei, Sierra)  device          u3g             # USB-based 3G modems (Option, Huawei, Sierra)
 device          uark            # Technologies ARK3116 based serial adapters  device          uark            # Technologies ARK3116 based serial adapters
Line 406  device  dcons  # Dumb console driver Line 416  device  dcons  # Dumb console driver
 device          dcons_crom      # Configuration ROM for dcons  device          dcons_crom      # Configuration ROM for dcons
   
 # Sound support  # Sound support
device          sound           # Generic sound driver (required)device          sound                   # Generic sound driver (required)
device          snd_cmi         # CMedia CMI8338/CMI8738device          snd_cmi                 # CMedia CMI8338/CMI8738
device          snd_csa         # Crystal Semiconductor CS461x/428xdevice          snd_csa                 # Crystal Semiconductor CS461x/428x
device          snd_emu10kx     # Creative SoundBlaster Live! and Audigydevice          snd_emu10kx             # Creative SoundBlaster Live! and Audigy
device          snd_es137x      # Ensoniq AudioPCI ES137xdevice          snd_es137x              # Ensoniq AudioPCI ES137x
device          snd_hda         # Intel High Definition Audiodevice          snd_hda                 # Intel High Definition Audio
device          snd_ich         # Intel, NVidia and other ICH AC'97 Audiodevice          snd_ich                 # Intel, NVidia and other ICH AC'97 Audio
device          snd_via8233     # VIA VT8233x Audiodevice          snd_via8233             # VIA VT8233x Audio
   
 # MMC/SD  # MMC/SD
device          mmc             # MMC/SD busdevice          mmc                     # MMC/SD bus
device          mmcsd           # MMC/SD memory carddevice          mmcsd                   # MMC/SD memory card
device          sdhci           # Generic PCI SD Host Controllerdevice          sdhci                   # Generic PCI SD Host Controller
   
 # VirtIO support  # VirtIO support
device          virtio          # Generic VirtIO bus (required)device          virtio                  # Generic VirtIO bus (required)
device          virtio_pci      # VirtIO PCI devicedevice          virtio_pci              # VirtIO PCI device
device          vtnet           # VirtIO Ethernet devicedevice          vtnet                   # VirtIO Ethernet device
device          virtio_blk      # VirtIO Block devicedevice          virtio_blk              # VirtIO Block device
device          virtio_scsi     # VirtIO SCSI devicedevice          virtio_scsi             # VirtIO SCSI device
device          virtio_balloon  # VirtIO Memory Balloon devicedevice          virtio_balloon          # VirtIO Memory Balloon device
   
# HyperV drivers# HyperV drivers and enchancement support
device          hyperv          # HyperV drivers device          hyperv                  # HyperV drivers 
   
 # Xen HVM Guest Optimizations  # Xen HVM Guest Optimizations
 # NOTE: XENHVM depends on xenpci.  They must be added or removed together.  # NOTE: XENHVM depends on xenpci.  They must be added or removed together.
options         XENHVM          # Xen HVM kernel infrastructureoptions         XENHVM                  # Xen HVM kernel infrastructure
device          xenpci          # Xen HVM Hypervisor services driverdevice          xenpci                  # Xen HVM Hypervisor services driver
   
 # VMware support  # VMware support
device          vmx             # VMware VMXNET3 Ethernetdevice          vmx                     # VMware VMXNET3 Ethernet
   
   # The crypto framework is required by IPSEC
   device          crypto                  # Required by IPSEC
   
 ### ELWIX Additional custom settings ...  ### ELWIX Additional custom settings ...
   
 #device         iscsi_initiator  #device         iscsi_initiator
Line 460  device  pfsync Line 473  device  pfsync
   
 device          hifn  device          hifn
 device          enc  device          enc
 device          crypto  
 device          cryptodev  device          cryptodev
 options         IPSEC  
 options         IPSEC_NAT_T  options         IPSEC_NAT_T
 options         IPSEC_FILTERTUNNEL  
   
 options         ALTQ  options         ALTQ
 options         ALTQ_CBQ  options         ALTQ_CBQ
Line 534  options  NULLFS Line 544  options  NULLFS
 options         UNIONFS  options         UNIONFS
 options         TMPFS  options         TMPFS
   
 options         VFS_AIO  
   
 device          ic  device          ic
 device          iic  device          iic
 device          iicsmb  device          iicsmb
Line 584  device  amdsbwd Line 592  device  amdsbwd
 device          viawd  device          viawd
 device          wbwd  device          wbwd
   
   device          vxlan
   
 #device         disc  #device         disc
 #device         edsc  #device         edsc
 options         VIMAGE  options         VIMAGE
device          epair#device          epair
 device          stf  device          stf
   
 # NETMAP subsystem  # NETMAP subsystem
#device          netmapdevice          netmap
   
 device          rlswitch  device          rlswitch
   

Removed from v.1.5  
changed lines
  Added in v.1.6


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>