--- elwix/config/Attic/ELWIX	2012/10/12 08:22:43	1.4
+++ elwix/config/Attic/ELWIX	2013/07/15 07:56:07	1.6.4.2
@@ -16,7 +16,7 @@
 # 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.579 2012/10/01 21:42:32 ken Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -39,12 +39,13 @@ options 	SOFTUPDATES		# Enable FFS soft updates suppor
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
 options 	MD_ROOT			# MD is a potential root device
+options		MD_ROOT_SIZE=8000
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 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
@@ -54,7 +55,15 @@ 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_GATE
 options 	GEOM_UZIP
+options 	GEOM_REDBOOT
+device		geom_redboot
+device		geom_map	# to get access to the SPI flash partitions
+device		geom_uncompress	# compressed in-memory filesystem hackery!
+device		geom_uzip	# compressed in-memory filesystem support
+options 	GEOM_MAP
+options		GEOM_UNCOMPRESS
 options         GEOM_ELI
 options         GEOM_MIRROR
 options		GEOM_CONCAT
@@ -163,7 +172,7 @@ device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct ATA/SCSI access)
 device		ses		# Enclosure Services (SES and SAF-TE)
-device		ctl		# CAM Target Layer
+#device		ctl		# CAM Target Layer
 
 # RAID controllers interfaced to the SCSI subsystem
 device		amr		# AMI MegaRAID
@@ -172,6 +181,7 @@ device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RA
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
+device		hptnr		# Highpoint DC7280, R750
 device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
 device		hpt27xx		# Highpoint RocketRAID 27xx
 device		iir		# Intel Integrated RAID
@@ -183,6 +193,7 @@ device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID cont
 # RAID controllers
 device		aac		# Adaptec FSA RAID
 device		aacp		# SCSI passthrough for aac (requires CAM)
+device		aacraid		# Adaptec by PMC RAID
 device		ida		# Compaq Smart RAID
 device		mfi		# LSI MegaRAID SAS
 device		mlx		# Mylex DAC960 family
@@ -225,7 +236,6 @@ device		uart		# Generic UART driver
 device		ppc
 device		ppbus		# Parallel port bus (required)
 device		lpt		# Printer
-device		plip		# TCP/IP over parallel
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 
@@ -304,6 +314,9 @@ options		XBONEHACK
 options		WLCACHE
 device		wlan_acl
 device		wlan_xauth
+device		wlan_rssadapt
+#options	AH_RXCFG_SDMAMW_4BYTES
+options		IEEE80211_ALQ
 options		IEEE80211_SUPPORT_TDMA
 options		IEEE80211_SUPPORT_SUPERG
 # Wireless NIC cards
@@ -422,9 +435,18 @@ device		mmc		# MMC/SD bus
 device		mmcsd		# MMC/SD memory card
 device		sdhci		# Generic PCI SD Host Controller
 
+# VirtIO support
+device		virtio		# Generic VirtIO bus (required)
+device		virtio_pci	# VirtIO PCI device
+device		vtnet		# VirtIO Ethernet device
+device		virtio_blk	# VirtIO Block device
+device		virtio_scsi	# VirtIO SCSI device
+device		virtio_balloon	# VirtIO Memory Balloon device
+
 ### ELWIX Additional custom settings ...
 
 device		if_bridge
+device		bridgestp
 device		tap
 device		gre
 device		lagg
@@ -465,7 +487,6 @@ options 	IPFIREWALL
 options 	IPFIREWALL_VERBOSE
 options 	IPFIREWALL_VERBOSE_LIMIT=100
 options 	IPFIREWALL_DEFAULT_TO_ACCEPT
-options 	IPFIREWALL_FORWARD
 options 	IPFIREWALL_NAT
 options 	LIBALIAS
 options 	IPDIVERT
@@ -578,5 +599,7 @@ options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS
 options 	ACCEPT_FILTER_HTTP
 
-options 	ZERO_COPY_SOCKETS
 options 	SW_WATCHDOG
+
+device		etherswitch
+device		rtl8366rb