Update the configuration file section to match RELENG_6

This commit is contained in:
Marc Fonvieille 2007-07-19 12:05:16 +00:00
parent 555450a5bf
commit b3d13652a2
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=30506

View file

@ -583,6 +583,12 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
run older applications; platforms that gained support only in run older applications; platforms that gained support only in
5.X, such as ia64 and &sparc64;, do not require this option.</para> 5.X, such as ia64 and &sparc64;, do not require this option.</para>
<programlisting>options COMPAT_FREEBSD5 # Compatible with &os;5</programlisting>
<para>This option is required on &os;&nbsp;6.X and above to
support applications compiled on &os;&nbsp;5.X versions that use
&os;&nbsp;5.X system call interfaces.</para>
<programlisting>options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI</programlisting> <programlisting>options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI</programlisting>
<para>This causes the kernel to pause for 5 seconds before probing <para>This causes the kernel to pause for 5 seconds before probing
@ -631,14 +637,6 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<para>This option is related to the keyboard. It installs a CDEV entry <para>This option is related to the keyboard. It installs a CDEV entry
in <filename>/dev</filename>.</para> in <filename>/dev</filename>.</para>
<programlisting>options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~128k to driver.
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.</programlisting>
<para>This helps debugging by printing easier register definitions for
reading.</para>
<programlisting>options ADAPTIVE_GIANT # Giant mutex is adaptive.</programlisting> <programlisting>options ADAPTIVE_GIANT # Giant mutex is adaptive.</programlisting>
<para>Giant is the name of a mutual exclusion mechanism (a sleep mutex) <para>Giant is the name of a mutual exclusion mechanism (a sleep mutex)
@ -728,13 +726,17 @@ device atapicd # ATAPI CDROM drives</programlisting>
<programlisting># SCSI Controllers <programlisting># SCSI Controllers
device ahb # EISA AHA1742 family device ahb # EISA AHA1742 family
device ahc # AHA2940 and onboard AIC7xxx devices device ahc # AHA2940 and onboard AIC7xxx devices
options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~128k to driver.
device ahd # AHA39320/29320 and onboard AIC79xx devices device ahd # AHA39320/29320 and onboard AIC79xx devices
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.
device amd # AMD 53C974 (Teckram DC-390(T)) device amd # AMD 53C974 (Teckram DC-390(T))
device isp # Qlogic family device 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-Fusion device mpt # LSI-Logic MPT-Fusion
#device ncr # NCR/Symbios Logic #device ncr # NCR/Symbios Logic
device sym # NCR/Symbios Logic (newer chipsets) device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
device trm # Tekram DC395U/UW/F DC315U adapters device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters device adv # Advansys SCSI adapters
@ -749,7 +751,8 @@ device stg # TMC 18C30/18C50</programlisting>
<para>SCSI controllers. Comment out any you do not have in your <para>SCSI controllers. Comment out any you do not have in your
system. If you have an IDE only system, you can remove these system. If you have an IDE only system, you can remove these
altogether.</para> altogether. The <literal>*_REG_PRETTY_PRINT</literal> lines are
debugging options for their respective drivers.</para>
<programlisting># SCSI peripherals <programlisting># SCSI peripherals
device scbus # SCSI bus (required for SCSI) device scbus # SCSI bus (required for SCSI)
@ -818,7 +821,9 @@ device atkbdc # AT keyboard controller</programlisting>
<programlisting>device kbdmux # keyboard multiplexer</programlisting> <programlisting>device kbdmux # keyboard multiplexer</programlisting>
<para>Basic support for keyboard multiplexing.</para> <para>Basic support for keyboard multiplexing. If you do not plan
to use more than one keyboard on the system, you can safely
remove that line.</para>
<programlisting>device vga # VGA video card driver</programlisting> <programlisting>device vga # VGA video card driver</programlisting>
@ -995,6 +1000,7 @@ device sf # Adaptec AIC-6915 (<quote>Starfire</quote>)
device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x &amp; SK-982x gigabit Ethernet device sk # SysKonnect SK-984x &amp; 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 Ethernet
device ti # Alteon Networks Tigon I/II gigabit Ethernet device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 <quote>EPIC</quote>) device tx # SMC EtherPower II (83c170 <quote>EPIC</quote>)
@ -1026,8 +1032,23 @@ of which cards are
supported by which driver.</para> supported by which driver.</para>
<programlisting># Wireless NIC cards <programlisting># Wireless NIC cards
device wlan # 802.11 support device wlan # 802.11 support</programlisting>
device an # Aironet 4500/4800 802.11 wireless NICs.
<para>Generic 802.11 support. This line is required for wireless
networking.</para>
<programlisting>device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support</programlisting>
<para>Crypto support for 802.11 devices. These lines are needed
if you intend to use encryption and 802.11i security
protocols.</para>
<programlisting>device an # Aironet 4500/4800 802.11 wireless NICs.
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
device ath_rate_sample # SampleRate tx rate control for ath
device awi # BayStack 660 and others device awi # BayStack 660 and others
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.
@ -1119,7 +1140,7 @@ device bpf # Berkeley packet filter</programlisting>
<programlisting># USB support <programlisting># USB support
device uhci # UHCI PCI-&gt;USB interface device uhci # UHCI PCI-&gt;USB interface
device ohci # OHCI PCI-&gt;USB interface device ohci # OHCI PCI-&gt;USB interface
#device ehci # EHCI PCI-&gt;USB interface (USB 2.0) device ehci # EHCI PCI-&gt;USB interface (USB 2.0)
device usb # USB Bus (required) device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices #device udbp # USB Double Bulk Pipe devices
device ugen # Generic device ugen # Generic
@ -1128,6 +1149,7 @@ device ukbd # Keyboard
device ulpt # Printer device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
device urio # Diamond Rio 500 MP3 player device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners device uscanner # Scanners
# USB Ethernet, requires mii # USB Ethernet, requires mii