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

[svn at pcbsd.org]

Author: kris
Date: 2008-04-25 07:11:56 -0700 (Fri, 25 Apr 2008)
New Revision: 1773

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

Updated kernel config in trunk to allow building on FreeBSD 7



Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-04-25 12:51:33 UTC (rev 1772)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-04-25 14:11:56 UTC (rev 1773)
@@ -29,7 +29,8 @@
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
-options 	SCHED_4BSD		# 4BSD scheduler
+#options 	SCHED_4BSD		# 4BSD scheduler
+options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
@@ -53,11 +54,11 @@
 options		UDF_ICONV
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_GPT		# GUID Partition Tables.
 options		GEOM_UZIP		# Read-only compressed disks
 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 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	SYSVSHM			# SYSV-style shared memory
@@ -74,7 +75,7 @@
 device		apic			# I/O APIC
 
 # Bus support.
-device		isa
+#device		isa
 #device		eisa
 device		pci
 
@@ -129,7 +130,6 @@
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
-device		rr232x		# Highpoint RocketRAID 232x
 device		iir		# Intel Integrated RAID
 device		ips		# IBM (Adaptec) ServeRAID
 device		mly		# Mylex AcceleRAID/eXtremeRAID
@@ -234,7 +234,6 @@
 device		ep		# Etherlink III based cards
 device		fe		# Fujitsu MB8696x based cards
 device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
-device		lnc		# NE2100, NE32-VL Lance Ethernet cards
 device		sn		# SMC's 9000 series of Ethernet chips
 device		xe		# Xircom pccard Ethernet
 
@@ -285,7 +284,6 @@
 #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 Ethernet, requires miibus
@@ -301,6 +299,22 @@
 device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 
+
+# Direct Rendering modules for 3d accelleration
+#device 		drm		# DRM Core Module
+#device 		mach64drm	# ATI Rage Pro
+#device		mgadrm		# AGP Matrox G200
+#device		r128drm         # ATI Rage 128
+#device		radeondrm       # ATI Radeon
+#device		sisdrm		# SIS 300/305
+#device		i915drm		# Intel i830 through i915
+#device		savagedrm	# S3 Savage 3D, Savage 4
+#device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
+
+#options 	VESA		# Vesa Support for Splash
+#options		SC_PIXEL_MODE	# add support for the raster tex
+
+options 	HZ=1000
 options 	DEVICE_POLLING
 
 device 		pf
@@ -316,4 +330,4 @@
 options		ALTQ_PRIQ
 options		ALTQ_NOPCC
 
-options		SMP			# Enable SMP support by default
+options		SMP