--- elwix/config/ELWIX_amd64	2016/12/22 14:23:21	1.1.2.4
+++ elwix/config/ELWIX_amd64	2017/02/13 16:52:46	1.2
@@ -1,4 +1,4 @@
-# $Id: ELWIX_amd64,v 1.1.2.4 2016/12/22 14:23:21 misho Exp $
+# $Id: ELWIX_amd64,v 1.2 2017/02/13 16:52:46 misho Exp $
 # $FreeBSD: head/sys/amd64/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $
 
 cpu		HAMMER
@@ -40,12 +40,11 @@ options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 #options 	GEOM_GATE
+options 	GEOM_MAP
 options 	GEOM_UZIP
 #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_UNCOMPRESS
+device		geom_uzip	# compressed in-memory filesystem support
 options         GEOM_ELI
 options         GEOM_MIRROR
 options		GEOM_CONCAT
@@ -53,7 +52,7 @@ options		GEOM_STRIPE
 options		GEOM_VIRSTOR
 options		GEOM_CACHE
 options		GEOM_MULTIPATH
-options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
+#options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
 options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
 options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
@@ -62,6 +61,7 @@ options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
 options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
+options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
@@ -105,6 +105,7 @@ options 	FLOWTABLE		# per-cpu routing cache
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
 options 	DEVICE_NUMA		# I/O Device Affinity
+options 	EARLY_AP_STARTUP
 
 # CPU frequency control
 device		cpufreq
@@ -294,7 +295,6 @@ device		sn		# SMC's 9000 series of Ethernet chips
 device		xe		# Xircom pccard Ethernet
 
 options		XBONEHACK
-options		WLCACHE
 device		wlan_acl
 device		wlan_xauth
 device		wlan_rssadapt
@@ -427,7 +427,7 @@ device		virtio_blk		# VirtIO Block device
 device		virtio_scsi		# VirtIO SCSI device
 device		virtio_balloon		# VirtIO Memory Balloon device
 
-# HyperV drivers and enhancement support
+# HyperV drivers and enchancement support
 device		hyperv			# HyperV drivers 
 
 # Xen HVM Guest Optimizations
@@ -461,9 +461,7 @@ device		hifn
 device		enc
 device		crypto
 device		cryptodev
-options		IPSEC
 options		IPSEC_NAT_T
-options		IPSEC_FILTERTUNNEL
 
 options		ALTQ
 options		ALTQ_CBQ
@@ -533,8 +531,6 @@ options 	NULLFS
 options 	UNIONFS
 options		TMPFS
 
-options		VFS_AIO
-
 device		ic
 device		iic
 device		iicsmb
@@ -581,11 +577,11 @@ device		wbwd
 #device		disc
 #device		edsc
 options		VIMAGE
-device		epair
+#device		epair
 device		stf
 
 # NETMAP subsystem
-#device		netmap
+device		netmap
 
 device		rlswitch