[PC-BSD Commits] r4096 - pcbsd/trunk-current/system-overlay/usr/PCBSD/conf
svn at pcbsd.org
svn at pcbsd.org
Thu Jun 11 08:51:05 PDT 2009
Author: kris
Date: 2009-06-11 08:51:04 -0700 (Thu, 11 Jun 2009)
New Revision: 4096
Modified:
pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64
pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386
Log:
Updated our kernel configs for 8-Current
Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64 2009-06-11 15:20:05 UTC (rev 4095)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64 2009-06-11 15:51:04 UTC (rev 4096)
@@ -1,8 +1,8 @@
#
# GENERIC -- Generic kernel configuration file for FreeBSD/amd64
#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
#
# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
@@ -24,6 +24,12 @@
# To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" # Default places to look for devices.
+# Use the following to compile in values accessible to the kernel
+# through getenv() (or kenv(1) in userland). The format of the file
+# is 'variable=value', see kenv(1)
+#
+# env "GENERIC.env"
+
#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options SCHED_ULE # ULE scheduler
@@ -50,11 +56,12 @@
options GEOM_LABEL # Provides labelization
options GEOM_JOURNAL # Provides GJournal support
options GEOM_UZIP # UZIP Support
-options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
+options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty)
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options STACK # stack(9) support
@@ -63,9 +70,11 @@
options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options ADAPTIVE_GIANT # Giant mutex is adaptive.
options STOP_NMI # Stop CPUS using NMI instead of IPI
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options MAC # TrustedBSD MAC Framework
+options FLOWTABLE # per-cpu routing cache
#options KDTRACE_FRAME # Ensure frames are compiled in
#options KDTRACE_HOOKS # Kernel DTrace hooks
@@ -110,7 +119,7 @@
device amd # AMD 53C974 (Tekram DC-390(T))
device hptiop # Highpoint RocketRaid 3xxx series
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 ncr # NCR/Symbios Logic
device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
@@ -198,6 +207,7 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
@@ -205,8 +215,9 @@
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
+device ae # Attansic/Atheros L2 FastEthernet
device age # Attansic/Atheros L1 Gigabit Ethernet
-device ae # Attansic/Atheros L2 Gigabit Ethernet
+device alc # Atheros AR8131/AR8132 Ethernet
device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
@@ -226,7 +237,6 @@
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
-device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vge # VIA VT612x gigabit Ethernet
@@ -246,6 +256,8 @@
# Wireless NIC cards
device wlan # 802.11 support
+options IEEE80211_DEBUG # enable debug msgs
+options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
@@ -254,8 +266,8 @@
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
device ath # Atheros pci/cardbus NIC's
-device ath_hal # Atheros HAL (Hardware Access Layer)
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+device ath_hal # pci/cardbus chip support
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
device ath_rate_sample # SampleRate tx rate control for ath
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
@@ -263,7 +275,6 @@
device iwi # Intel Wireless Adapters
device ipw # Intel Wireless Adapters
device wpi # Intel WPI adapters
-device firmware # firmware assist module
# Pseudo devices.
@@ -273,10 +284,11 @@
device sl # Kernel SLIP
device ppp # Kernel PPP
device tun # Packet tunnel.
-device pty # Pseudo-ttys (telnet etc)
+device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
device gif # IPv6 and IPv4 tunneling
device faith # IPv6-to-IPv4 relaying (translation)
+device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
@@ -292,13 +304,16 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
-#device ulpt # Printer
+device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
# USB Serial devices
+device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
device ubsa # Belkin F5U103 and compatible serial adapters
@@ -316,6 +331,7 @@
device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
+device udav # Davicom DM9601E USB
# FireWire support
device firewire # FireWire bus code
Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386 2009-06-11 15:20:05 UTC (rev 4095)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386 2009-06-11 15:51:04 UTC (rev 4096)
@@ -1,8 +1,8 @@
#
# GENERIC -- Generic kernel configuration file for FreeBSD/i386
#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
#
# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
@@ -27,6 +27,12 @@
# To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" # Default places to look for devices.
+# Use the following to compile in values accessible to the kernel
+# through getenv() (or kenv(1) in userland). The format of the file
+# is 'variable=value', see kenv(1)
+#
+# env "GENERIC.env"
+
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
@@ -57,11 +63,12 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
+options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty)
options GEOM_UZIP # Read-only compressed disks
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options STACK # stack(9) support
@@ -70,9 +77,11 @@
options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options ADAPTIVE_GIANT # Giant mutex is adaptive.
options STOP_NMI # Stop CPUS using NMI instead of IPI
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options MAC # TrustedBSD MAC Framework
+options FLOWTABLE # per-cpu routing cache
# To make an SMP kernel, the next two lines are needed
options SMP # Symmetric MultiProcessor Kernel
@@ -83,6 +92,7 @@
# Bus support.
+device acpi
device eisa
device pci
@@ -110,7 +120,7 @@
device amd # AMD 53C974 (Tekram DC-390(T))
device hptiop # Highpoint RocketRaid 3xxx series
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 ncr # NCR/Symbios Logic
device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
@@ -207,14 +217,16 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
# 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!
device miibus # MII bus support
+device ae # Attansic/Atheros L2 FastEthernet
device age # Attansic/Atheros L1 Gigabit Ethernet
-device ae # Attansic/Atheros L2 Gigabit Ethernet
+device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
@@ -236,7 +248,6 @@
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
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 tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vge # VIA VT612x gigabit Ethernet
@@ -257,6 +268,8 @@
# Wireless NIC cards
device wlan # 802.11 support
+options IEEE80211_DEBUG # enable debug msgs
+options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
@@ -265,8 +278,8 @@
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
device ath # Atheros pci/cardbus NIC's
-device ath_hal # Atheros HAL (Hardware Access Layer)
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+device ath_hal # pci/cardbus chip support
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
device ath_rate_sample # SampleRate tx rate control for ath
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
@@ -275,7 +288,6 @@
device iwi # Intel Wireless Adapters
device ipw # Intel Wireless Adapters
device wpi # Intel WPI adapters
-device firmware # firmware assist module
# Pseudo devices.
@@ -285,10 +297,11 @@
device sl # Kernel SLIP
device ppp # Kernel PPP
device tun # Packet tunnel.
-device pty # Pseudo-ttys (telnet etc)
+device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
device gif # IPv6 and IPv4 tunneling
device faith # IPv6-to-IPv4 relaying (translation)
+device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
@@ -304,14 +317,17 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
-#device ulpt # Printer
+device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
+device rum # Ralink Technology RT2501USB wireless NICs
device ural # Ralink Technology RT2500USB wireless NICs
-device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
# USB Serial devices
+device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
device ubsa # Belkin F5U103 and compatible serial adapters
@@ -329,6 +345,7 @@
device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
+device udav # Davicom DM9601E USB
# FireWire support
device firewire # FireWire bus code
More information about the Commits
mailing list