[PC-BSD Commits] r2654 - pcbsd/trunk/system-overlay/PCBSD/conf
svn at pcbsd.org
svn at pcbsd.org
Mon Aug 25 14:49:55 PDT 2008
Author: kris
Date: 2008-08-25 14:49:54 -0700 (Mon, 25 Aug 2008)
New Revision: 2654
Modified:
pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
Log:
Updated our amd64 kernel config for PC-BSD 7
Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64 2008-08-25 20:31:21 UTC (rev 2653)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64 2008-08-25 21:49:54 UTC (rev 2654)
@@ -16,59 +16,66 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18.2.1 2007/12/15 06:32:33 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.11 2008/08/11 20:31:14 jfv Exp $
-machine amd64
cpu HAMMER
ident PCBSD
# To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" # Default places to look for devices.
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-
-options SCHED_4BSD # 4BSD scheduler
+options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
+options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
options UFS_DIRHASH # Improve performance on big directories
-options UFS_GJOURNAL # Support for journaling on UFS
-options GEOM_JOURNAL # Journaling via GEOM
+options UFS_GJOURNAL # Enable gjournal-based UFS journaling
+options GEOM_JOURNAL # Journaling via GEOM
options MD_ROOT # MD is a potential root device
options NFSCLIENT # Network Filesystem Client
options NFSSERVER # Network Filesystem Server
options NFS_ROOT # NFS usable as /, requires NFSCLIENT
-options NTFS # NT File System
+options NTFS
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
-options UDF # UFD Filesystem Support
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
-options GEOM_GPT # GUID Partition Tables.
-options GEOM_UZIP # Compressed FS support
-options COMPAT_43 # Needed by COMPAT_LINUX32
+options LIBICONV
+options LIBMCHAIN
+options CD9660_ICONV
+options MSDOSFS_ICONV
+options NTFS_ICONV
+options UDF
+options UDF_ICONV
+options GEOM_PART_GPT # GUID Partition Tables.
+options GEOM_LABEL # Provides labelization
+options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
options COMPAT_IA32 # Compatible with i386 binaries
+options GEOM_UZIP # Read-only compressed disks
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
-options COMPAT_LINUX32 # Compatible with i386 linux binaries
+options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
+options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
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 SCTP # Stream Control Transmission Protocol
+options STOP_NMI # Stop CPUS using NMI instead of IPI
+options AUDIT # Security event auditing
-# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
-device atpic # 8259A compatability
+# Make an SMP-capable kernel by default
+options SMP # Symmetric MultiProcessor Kernel
-# Linux 32-bit ABI support
-options LINPROCFS # Cannot be a module yet.
+# CPU frequency control
+device cpufreq
# Bus support.
device acpi
@@ -84,8 +91,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
-device atapicam # Cam control support
#options ATA_STATIC_ID # Static device numbering
+device atapicam # Atapi CAM Support
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
@@ -95,6 +102,7 @@
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.
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 mpt # LSI-Logic MPT-Fusion
@@ -107,7 +115,6 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-
# SCSI peripherals
device scbus # SCSI bus (required for SCSI)
device ch # SCSI media changers
@@ -124,7 +131,6 @@
device dpt # DPT Smartcache III, IV - See NOTES for options
device hptmv # Highpoint RocketRAID 182x
device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
-device rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
@@ -136,8 +142,6 @@
device ida # Compaq Smart RAID
device mfi # LSI MegaRAID SAS
device mlx # Mylex DAC960 family
-#XXX pointer/int warnings
-#device pst # Promise Supertrak SX6000
device twe # 3ware ATA RAID
# atkbdc0 controls both the keyboard and the PS/2 mouse
@@ -164,6 +168,7 @@
# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
+device uart # Generic UART driver
# Parallel port
device ppc
@@ -175,12 +180,13 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
+# line to enable it (connects to sio, uart and/or ppc drivers):
#device puc
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
-device em # Intel PRO/1000 adapter Gigabit Ethernet Card
+device em # Intel PRO/1000 Gigabit Ethernet Family
+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 txp # 3Com 3cR990 (``Typhoon'')
@@ -189,15 +195,19 @@
# 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 age # Attansic/Atheros L1 Gigabit Ethernet
device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
+device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
+device nfe # nVidia nForce MCP on-board Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
-device nfe # nVidia nForce MCP on-board Ethernet Networking
+#device nve # nVidia nForce MCP on-board Ethernet Networking
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -228,6 +238,9 @@
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
+device wlan_amrr # AMRR transmit rate control algorithm
+device wlan_scan_ap # 802.11 AP mode scanning
+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)
@@ -235,7 +248,13 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+#device wl # Older non 802.11 Wavelan wireless NIC.
+device iwi # Intel Wireless Adapters
+device ipw # Intel Wireless Adapters
+device wpi # Intel WPI adapters
+device firmware # firmware assist module
+
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
@@ -262,12 +281,23 @@
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 urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
+# USB Serial devices
+device ucom # Generic com ttys
+device uark # Technologies ARK3116 based serial adapters
+device ubsa # Belkin F5U103 and compatible serial adapters
+device ubser # BWCT console serial adapters
+device uftdi # For FTDI usb serial adapters
+device uipaq # Some WinCE based devices
+device uplcom # Prolific PL-2303 serial adapters
+device uslcom # SI Labs CP2101/CP2102 serial adapters
+device uvisor # Visor and Palm devices
+device uvscom # USB serial support for DDI pocket's PHS
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
@@ -280,24 +310,26 @@
device firewire # FireWire bus code
device sbp # SCSI over FireWire (Requires scbus and da)
device fwe # Ethernet over FireWire (non-standard!)
+device fwip # IP over FireWire (RFC 2734,3146)
+device dcons # Dumb console driver
+device dcons_crom # Configuration ROM for dcons
+
# Enable IPFIREWALL / IPDIVERT for natd to work properly
-options IPFIREWALL
-options IPFIREWALL_DEFAULT_TO_ACCEPT
-options IPDIVERT
+options IPFIREWALL
+options IPFIREWALL_DEFAULT_TO_ACCEPT
+options IPDIVERT
+device pf
+device pflog
+device pfsync
-device pf
-device pflog
-device pfsync
+options ALTQ
+options ALTQ_CBQ
+options ALTQ_RED
+options ALTQ_RIO
+options ALTQ_HFSC
+options ALTQ_CDNR
+options ALTQ_PRIQ
+options ALTQ_NOPCC
-options ALTQ
-options ALTQ_CBQ
-options ALTQ_RED
-options ALTQ_RIO
-options ALTQ_HFSC
-options ALTQ_CDNR
-options ALTQ_PRIQ
-options ALTQ_NOPCC
-
-options SMP # Enable SMP support by default
More information about the Commits
mailing list