--- elwix/config/ELWIX_i386	2013/08/05 13:10:16	1.2
+++ elwix/config/ELWIX_i386	2014/07/30 05:33:40	1.4.2.7
@@ -1,12 +1,12 @@
-# $Id: ELWIX_i386,v 1.2 2013/08/05 13:10:16 misho Exp $
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
+# $Id: ELWIX_i386,v 1.4.2.7 2014/07/30 05:33:40 misho Exp $
+# $FreeBSD: head/sys/i386/conf/GENERIC 268045 2014-06-30 16:18:38Z emaste $
 
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
 ident		ELWIX_i386
 
-include		DEFAULTS
+#include		DEFAULTS
 
 hints		"ELWIX_i386.hints"	# Default places to look for devices.
 
@@ -27,10 +27,9 @@ 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 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
-options 	NFSCLIENT		#Network File System client
-options 	NFSSERVER		#Network File System server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
@@ -83,9 +82,8 @@ options 	INCLUDE_CONFIG_FILE     # Include this file i
 
 # 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:
+# For full debugger support use (turn off in stable branch):
 #options 	DDB			# Support DDB.
 #options 	GDB			# Support remote GDB.
 #options 	DEADLKRES		# Enable the deadlock resolver
@@ -104,7 +102,6 @@ device		cpufreq
 
 # Bus support.
 device		acpi
-device		eisa
 device		pci
 
 # Floppy drives
@@ -118,7 +115,6 @@ device		mvs		# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC 
 device		siis		# SiliconImage SiI3124/SiI3132/SiI3531 SATA
 
 # 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.
@@ -131,6 +127,7 @@ device		isp		# Qlogic family
 #device		ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 device		mps		# LSI-Logic MPT-Fusion 2
+device		mpr		# LSI-Logic MPT-Fusion 3
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 device		trm		# Tekram DC395U/UW/F DC315U adapters
@@ -154,7 +151,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
@@ -198,8 +195,12 @@ device		splash		# Splash screen and screen saver suppo
 device		sc
 options 	SC_PIXEL_MODE	# add support for the raster text mode
 
-device		agp		# support several AGP chipsets
+# vt is the new video console driver
+device		vt
+device		vt_vga
 
+device		agp			# support several AGP chipsets
+
 # Power management support (see NOTES for more options)
 #device		apm
 # Add suspend/resume support for the i8254.
@@ -224,7 +225,7 @@ device		ppi		# Parallel port interface device
 device		puc		# Multi I/O cards and multi-channel UARTs
 
 # PCI Ethernet NICs.
-device		bxe		# Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
+device		bxe		# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		em		# Intel PRO/1000 Gigabit Ethernet Family
 device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
@@ -263,7 +264,6 @@ device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 device		nfe		# nVidia nForce MCP on-board Ethernet
 device		nge		# NatSemi DP83820 gigabit Ethernet
-#device		nve		# nVidia nForce MCP on-board Ethernet Networking
 device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
@@ -341,8 +341,8 @@ 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		padlock_rng	# VIA Padlock RNG
+device		rdrand_rng	# Intel Bull Mountain RNG
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tun		# Packet tunnel.
@@ -427,7 +427,20 @@ device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
 
+# HyperV drivers
+device		hyperv		# HyperV drivers 
+
+# Xen HVM Guest Optimizations
+# NOTE: XENHVM depends on xenpci.  They must be added or removed together.
+options 	XENHVM		# Xen HVM kernel infrastructure
+device		xenpci		# Xen HVM Hypervisor services driver
+
+# VMware support
+device		vmx		# VMware VMXNET3 Ethernet
+
 ### ELWIX Additional custom settings ...
+
+#device		iscsi_initiator
 
 device		if_bridge
 device		tap