--- elwix/config/ELWIX_i386	2013/08/05 13:10:16	1.2
+++ elwix/config/ELWIX_i386	2014/01/05 23:14:23	1.4
@@ -1,4 +1,4 @@
-# $Id: ELWIX_i386,v 1.2 2013/08/05 13:10:16 misho Exp $
+# $Id: ELWIX_i386,v 1.4 2014/01/05 23:14:23 misho Exp $
 # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
@@ -6,7 +6,7 @@ cpu		I586_CPU
 cpu		I686_CPU
 ident		ELWIX_i386
 
-include		DEFAULTS
+#include		DEFAULTS
 
 hints		"ELWIX_i386.hints"	# Default places to look for devices.
 
@@ -27,6 +27,7 @@ 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
@@ -75,17 +76,18 @@ options 	HWPMC_HOOKS		# Necessary kernel hooks for hwp
 options 	AUDIT			# Security event auditing
 options 	CAPABILITY_MODE		# Capsicum capability mode
 options 	CAPABILITIES		# Capsicum capabilities
+options 	PROCDESC		# Support for process descriptors
 options 	MAC			# TrustedBSD MAC Framework
 #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
+options 	XENHVM			# Include Xen support
 
 # 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 +156,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 +226,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 +343,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.
@@ -426,6 +428,9 @@ device		vtnet		# VirtIO Ethernet device
 device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
+
+# Xen support
+device		xenpci		# Generic Xen bus
 
 ### ELWIX Additional custom settings ...