--- elwix/config/Attic/ELWIX	2011/10/21 01:24:58	1.2.2.5
+++ elwix/config/Attic/ELWIX	2012/10/09 15:21:59	1.3.2.13
@@ -16,19 +16,23 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.556 2011/10/19 21:55:20 kensmith Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.578 2012/09/13 10:12:16 kib Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
 ident		ELWIX
 
+options 	INIT_PATH=/sbin/initx:/sbin/init
+
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
+options 	TCP_OFFLOAD		# TCP offload
 options 	SCTP			# Stream Control Transmission Protocol
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
@@ -38,7 +42,9 @@ options 	UFS_GJOURNAL		# Enable gjournal-based UFS jou
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
-options		MD_ROOT_SIZE=5120
+options 	NFSCLIENT		#Network File System client
+options 	NFSSERVER		#Network File System server
+options		MD_ROOT_SIZE=8400
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
@@ -46,20 +52,16 @@ options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_GPT		# GUID Partition Tables.
+options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_UZIP
-options         GEOM_JOURNAL
 options         GEOM_ELI
 options         GEOM_MIRROR
 options		GEOM_CONCAT
 options		GEOM_STRIPE
 options		GEOM_VIRSTOR
-options		GEOM_SHSEC
-options		GEOM_RAID3
 options		GEOM_CACHE
 options		GEOM_MULTIPATH
-options		GEOM_NOP
-options 	GEOM_AES		# Don't use, use GEOM_BDE
 options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
 options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
@@ -79,13 +81,19 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent printf output 
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
+options 	CAPABILITY_MODE		# Capsicum capability mode
+options 	CAPABILITIES		# Capsicum capabilities
 options 	MAC			# TrustedBSD MAC Framework
-options 	FLOWTABLE		# per-cpu routing cache
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+#options 	DDB_CTF			# Kernel ELF linker loads CTF data
+options 	FLOWTABLE		# per-cpu routing cache
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
-# Debugging for use in -current
+# Debugging support.  Always need this:
 #options 	KDB			# Enable kernel debugger support.
+# For minimum debugger support (stable branch) use:
+#options 	KDB_TRACE		# Print a stack trace for a panic.
+# For full debugger support use this instead:
 #options 	DDB			# Support DDB.
 #options 	GDB			# Support remote GDB.
 #options 	DEADLKRES		# Enable the deadlock resolver
@@ -126,7 +134,7 @@ options 	AHC_REG_PRETTY_PRINT	# Print register bitfiel
 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		esp		# AMD Am53C974 (Tekram DC-390(T))
 device		hptiop		# Highpoint RocketRaid 3xxx series
 device		isp		# Qlogic family
 #device		ispfw		# Firmware for QLogic HBAs- normally a module
@@ -144,6 +152,7 @@ device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
 device		ncv		# NCR 53C500
 device		nsp		# Workbit Ninja SCSI-3
 device		stg		# TMC 18C30/18C50
+device		isci		# Intel C600 SAS controller
 
 # ATA/SCSI peripherals
 device		scbus		# SCSI bus (required for ATA/SCSI)
@@ -152,7 +161,8 @@ device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct ATA/SCSI access)
-device		ses		# SCSI Environmental Services (and SAF-TE)
+device		ses		# Enclosure Services (SES and SAF-TE)
+device		ctl		# CAM Target Layer
 
 # RAID controllers interfaced to the SCSI subsystem
 device		amr		# AMI MegaRAID
@@ -162,6 +172,7 @@ device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
 device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
+device		hpt27xx		# Highpoint RocketRAID 27xx
 device		iir		# Intel Integrated RAID
 device		ips		# IBM (Adaptec) ServeRAID
 device		mly		# Mylex AcceleRAID/eXtremeRAID
@@ -185,6 +196,7 @@ device		psm		# PS/2 mouse
 device		kbdmux		# keyboard multiplexer
 
 device		vga		# VGA video card driver
+options 	VESA		# Add support for VESA BIOS Extensions (VBE)
 
 device		splash		# Splash screen and screen saver support
 
@@ -217,7 +229,6 @@ device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 
 device		puc		# Multi I/O cards and multi-channel UARTs
-device		mos
 
 # PCI Ethernet NICs.
 device		bxe		# Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
@@ -229,6 +240,14 @@ 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'')
+#device		vxge		# Exar/Neterion XFrame 3100 10GbE
+#device		mxge		# Myricom Myri-10G 10GbE NIC
+#device		nxge		# Neterion Xframe 10GbE Server/Storage Adapter
+#device		ixgbe		# Intel Pro/10Gbe PCIE Ethernet
+#device		cxgbe		# Chelsio T4 10GbE PCIe adapter
+#device		cxgb		# Chelsio T3 10 Gigabit Ethernet
+#device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
+#device		my		# Myson Fast Ethernet (MTD80X, MTD89X)
 
 # 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!
@@ -240,9 +259,12 @@ device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
+#device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
 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		gem		# Sun GEM/Sun ERI/Apple GMAC
+#device		hme		# Sun HME (Happy Meal Ethernet)
 device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
@@ -293,10 +315,12 @@ device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
-device		ath		# Atheros NIC's
+device		ath		# Atheros NICs
 device		ath_pci		# Atheros pci/cardbus glue
 device		ath_hal		# pci/cardbus chip support
 options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
+options 	AH_AR5416_INTERRUPT_MITIGATION	# AR5416 interrupt mitigation
+options 	ATH_ENABLE_11N	# Enable 802.11n support for AR5416 and later
 device		ath_rate_sample	# SampleRate tx rate control for ath
 device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
 device		bwn		# Broadcom BCM43xx wireless NICs.
@@ -309,19 +333,21 @@ 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		wpi		# Intel 3945ABG wireless NICs.
-device		iwnfw
+
 device		iwifw
 device		ipwfw
-device		wpifw
+device		iwnfw
 device		mwlfw
+device		wpifw
 
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
+options 	PADLOCK_RNG	# VIA Padlock RNG
+options 	RDRAND_RNG	# Intel Bull Mountain RNG
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tun		# Packet tunnel.
-device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"
 device		gif		# IPv6 and IPv4 tunneling
 device		faith		# IPv6-to-IPv4 relaying (translation)
@@ -339,13 +365,8 @@ device		ohci		# OHCI PCI->USB interface
 device		ehci		# EHCI PCI->USB interface (USB 2.0)
 device		xhci		# XHCI PCI->USB interface (USB 3.0)
 device		usb		# USB Bus (required)
-#device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
-device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
-device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
-device		urio		# Diamond Rio 500 MP3 player
 # USB Serial devices
 device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
 device		uark		# Technologies ARK3116 based serial adapters
@@ -373,6 +394,9 @@ device		ural		# Ralink Technology RT2500USB wireless N
 device		urtw		# Realtek RTL8187B/L wireless NICs
 device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
+device		ucom
+device		umcs
+
 # FireWire support
 device		firewire	# FireWire bus code
 # sbp(4) works for some systems but causes boot failure on others
@@ -384,12 +408,21 @@ device		dcons_crom	# Configuration ROM for dcons
 
 # Sound support
 device		sound		# Generic sound driver (required)
+device		snd_cmi		# CMedia CMI8338/CMI8738
+device		snd_csa		# Crystal Semiconductor CS461x/428x
+device		snd_emu10kx	# Creative SoundBlaster Live! and Audigy
 device		snd_es137x	# Ensoniq AudioPCI ES137x
 device		snd_hda		# Intel High Definition Audio
 device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
-device		snd_uaudio	# USB Audio
 device		snd_via8233	# VIA VT8233x Audio
 
+# MMC/SD
+device		mmc		# MMC/SD bus
+device		mmcsd		# MMC/SD memory card
+device		sdhci		# Generic PCI SD Host Controller
+
+### ELWIX Additional custom settings ...
+
 device		if_bridge
 device		tap
 device		gre
@@ -422,6 +455,8 @@ options		ALTQ_RED
 options		ALTQ_RIO
 
 options 	MROUTING
+options 	RADIX_MPATH
+options		PPS_SYNC
 options 	DEVICE_POLLING
 options		HZ=1000
 
@@ -482,6 +517,7 @@ options		VFS_AIO
 device		ic
 device		iic
 device		iicsmb
+#device		iicoc		# OpenCores I2C controller support
 device		smb
 device		smbus
 device		iicbus
@@ -491,11 +527,28 @@ options		BKTR_NEW_MSP34XX_DRIVER
 options		BKTR_KODICOM_MUX
 device		speaker
 
+device		ds133x
+device		ds1374
+device		ds1672
+
+device		intpm
+device		alpm
+device		ichsmb
+device		viapm
+device		amdpm
+device		amdsmb
+device		nfpm
+device		nfsmb
+
+device		ipmi
+device		pcf
+
 device		gpio
 device		gpioled
 device		gpioiic
 
 device		glxsb
+device		glxiic
 options		CPU_GEODE
 options		CPU_SOEKRIS
 options		COMPAT_AOUT
@@ -505,22 +558,20 @@ device		coretemp
 device		cpuctl
 device		nvram
 device		ichwd
+device		amdsbwd
+device		viawd
+device		wbwd
 
-#device		ef
-device		cas
-device		cxgb
-device		vxge
-device		disc
-device		edsc
+#device		disc
+#device		edsc
+options		VIMAGE
 device		epair
-#device		gem
-#device		hme
-device		mxge
-device		my
-device		nxge
 device		stf
 
+# NETMAP subsystem
 #device		netmap
+
+device		rlswitch
 
 options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS