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

svn at pcbsd.org svn at pcbsd.org
Fri Aug 1 11:09:25 PDT 2008


Author: kris
Date: 2008-08-01 11:09:25 -0700 (Fri, 01 Aug 2008)
New Revision: 2512

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

Updated our default kernel to be more in line with whats currently in GENERIC on STABLE



Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-08-01 16:41:16 UTC (rev 2511)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-08-01 18:09:25 UTC (rev 2512)
@@ -27,9 +27,6 @@
 # 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
@@ -38,7 +35,7 @@
 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 	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
@@ -180,6 +177,7 @@
 
 # Serial (COM) ports
 device		sio		# 8250, 16[45]50 based serial ports
+device		uart		# Generic UART driver
 
 # Parallel port
 device		ppc
@@ -198,12 +196,14 @@
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
 device		ixgb		# Intel PRO/10GbE Ethernet Card
+device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 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		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		et		# Truephy Ethernet 
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
@@ -212,7 +212,7 @@
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		nge		# NatSemi DP83820 gigabit Ethernet
-device		nfe		# nVidia nForce MCP on-board Ethernet Networking
+device		nfe		# nVidia nForce MCP on-board Ethernet
 device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
@@ -220,7 +220,7 @@
 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          stge            # Sundance/Tamarack TC9021 gigabit Ethernet
+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'')
@@ -229,8 +229,6 @@
 device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 device          msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
-device		age		# Attansic/Atheros L1 Gigabit Ethernet driver
-device		le		# AMD Am7900 LANCE and Am79C9xx ILACC/PCnet
 
 # ISA Ethernet NICs.  pccard NICs included.
 device		cs		# Crystal Semiconductor CS89x0 NIC
@@ -244,23 +242,25 @@
 device		xe		# Xircom pccard Ethernet
 
 # Wireless NIC cards
-device          wlan            # 802.11 support
-device          wlan_wep        # 802.11 WEP support
-device          wlan_ccmp       # 802.11 CCMP support
-device          wlan_tkip       # 802.11 TKIP support
-device          wlan_amrr       # 802.11 for WPI devices
-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          ral             # Ralink Technology RT2500 wireless NICs.
-device          wi              # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+device		wlan		# 802.11 support
+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)
+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.
 #device		wl		# Older non 802.11 Wavelan wireless NIC.
-device          iwi             # Intel Wireless Adapters
-device          ipw             # Intel Wireless Adapters
+device		iwi		# Intel Wireless Adapters
+device		ipw		# Intel Wireless Adapters
 device		wpi		# Intel WPI adapters
-device          firmware        # Loads intel firmware for wireless
+device		firmware	# firmware assist module
 
 
 # Pseudo devices.
@@ -292,8 +292,21 @@
 #device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
+device		ural		# Ralink Technology RT2500USB wireless NICs
+device		rum		# Ralink Technology RT2501USB 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
@@ -308,20 +321,6 @@
 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
 



More information about the Commits mailing list