[PC-BSD Commits] r2651 - pcbsd/trunk/system-overlay/PCBSD/conf

[svn at pcbsd.org]

Author: kris
Date: 2008-08-25 10:23:47 -0700 (Mon, 25 Aug 2008)
New Revision: 2651

Modified:
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386
Log:

Updated the default kernel a bit more to fit the latest GENERIC in 7-Stable



Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-08-25 15:49:26 UTC (rev 2650)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-08-25 17:23:47 UTC (rev 2651)
@@ -31,6 +31,7 @@
 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
@@ -53,27 +54,33 @@
 options		UDF_ICONV
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 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		GEOM_UZIP		# Read-only compressed disks
-options		GEOM_LABEL		# Provide labelization
-options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-options 	COMPAT_FREEBSD6		# Compatible with FreeBSD5
+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 	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.
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
+options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
+options 	AUDIT			# Security event auditing
+
+# To make an SMP kernel, the next two lines are needed
+options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
-options	        SCTP                    # Stream Control Transmission Protocol
 
+# CPU frequency control
+device		cpufreq
+
+
 # Bus support.
 device		eisa
 device		pci
@@ -94,7 +101,11 @@
 # SCSI Controllers
 device		ahb		# EISA AHA1742 family
 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
+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
@@ -159,11 +170,6 @@
 # syscons is the default console driver, resembling an SCO console
 device		sc
 
-# Enable this for the pcvt (VT220 compatible) console driver
-#device		vt
-#options 	XSERVER		# support for X server on a vt console
-#options 	FAT_CURSOR	# start with block cursor
-
 device		agp		# support several AGP chipsets
 
 # Power management support (see NOTES for more options)
@@ -191,7 +197,7 @@
 
 # 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.
@@ -257,7 +263,7 @@
 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		ath_rate_sample	# SampleRate tx rate control for ath
 device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
@@ -324,11 +330,11 @@
 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
 
 
-options 	HZ=1000
-options 	DEVICE_POLLING
-
 # Enable IPFIREWALL / IPDIVERT for natd to work properly
 options 	IPFIREWALL
 options 	IPFIREWALL_DEFAULT_TO_ACCEPT
@@ -347,6 +353,3 @@
 options		ALTQ_PRIQ
 options		ALTQ_NOPCC
 
-options		SMP
-
-