--- elwix/config/ELWIX_i386	2013/07/18 01:35:20	1.1.2.7
+++ elwix/config/ELWIX_i386	2014/01/07 08:41:29	1.4.2.2
@@ -1,4 +1,4 @@
-# $Id: ELWIX_i386,v 1.1.2.7 2013/07/18 01:35:20 misho Exp $
+# $Id: ELWIX_i386,v 1.4.2.2 2014/01/07 08:41:29 misho Exp $
 # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
@@ -6,6 +6,8 @@ cpu		I586_CPU
 cpu		I686_CPU
 ident		ELWIX_i386
 
+#include		DEFAULTS
+
 hints		"ELWIX_i386.hints"	# Default places to look for devices.
 
 options 	INIT_PATH=/sbin/initx:/sbin/init
@@ -30,7 +32,6 @@ 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=8000
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
@@ -42,10 +43,10 @@ options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_GATE
 options 	GEOM_UZIP
-device		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
+#device		geom_uncompress	# compressed in-memory filesystem hackery!
+#device		geom_uzip	# compressed in-memory filesystem support
 options		GEOM_UNCOMPRESS
 options         GEOM_ELI
 options         GEOM_MIRROR
@@ -83,9 +84,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
@@ -154,7 +154,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
@@ -224,7 +224,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
@@ -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,6 +427,17 @@ 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		if_bridge
@@ -437,7 +448,7 @@ device		carp
 
 device		siba_bwn
 
-options		NDISAPI
+#options		NDISAPI
 #device		ndis
 
 device		pf
@@ -512,6 +523,9 @@ options		NETGRAPH_BPF
 options		NETGRAPH_GIF
 options		NETGRAPH_GIF_DEMUX
 options		NETGRAPH_BRIDGE
+options		NETGRAPH_VLAN
+options		NETGRAPH_PIPE
+options		NETGRAPH_CAR
 
 options 	NULLFS
 options 	UNIONFS