--- elwix/config/ELWIX_i386	2016/11/28 11:22:27	1.5.2.4
+++ elwix/config/ELWIX_i386	2017/06/08 13:13:56	1.6.2.1
@@ -1,25 +1,26 @@
-# $Id: ELWIX_i386,v 1.5.2.4 2016/11/28 11:22:27 misho Exp $
-# $FreeBSD: head/sys/i386/conf/GENERIC 299142 2016-05-05 22:26:23Z jhb $
+# $Id: ELWIX_i386,v 1.6.2.1 2017/06/08 13:13:56 misho Exp $
+# $FreeBSD: head/sys/i386/conf/GENERIC 310177 2016-12-16 21:10:37Z jhb $
 
 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.
 
 options 	INIT_PATH=/sbin/initx:/sbin/init
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
+makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
+options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	TCP_OFFLOAD		# TCP offload
 options 	SCTP			# Stream Control Transmission Protocol
 options 	FFS			# Berkeley Fast Filesystem
@@ -45,8 +46,7 @@ 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
+device		geom_uzip	# compressed in-memory filesystem support
 options         GEOM_ELI
 options         GEOM_MIRROR
 options		GEOM_CONCAT
@@ -62,6 +62,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
@@ -78,8 +79,8 @@ options 	AUDIT			# Security event auditing
 options 	CAPABILITY_MODE		# Capsicum capability mode
 options 	CAPABILITIES		# Capsicum capabilities
 options 	MAC			# TrustedBSD MAC Framework
-#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
-#options 	DDB_CTF			# Kernel ELF linker loads CTF data
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	DDB_CTF			# Kernel ELF linker loads CTF data
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 options 	FLOWTABLE		# per-cpu routing cache
 options 	RACCT			# Resource accounting framework
@@ -102,6 +103,7 @@ options 	GDB			# Support remote GDB.
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
+options 	EARLY_AP_STARTUP
 
 # CPU frequency control
 device		cpufreq
@@ -240,7 +242,6 @@ device		puc			# Multi I/O cards and multi-channel UART
 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
 device		ixgb			# Intel PRO/10GbE Ethernet Card
 device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
@@ -367,7 +368,7 @@ device		firmware		# firmware assist module
 device		bpf			# Berkeley packet filter
 
 # USB support
-#options 	USB_DEBUG		# enable debug msgs
+options 	USB_DEBUG		# enable debug msgs
 device		uhci			# UHCI PCI->USB interface
 device		ohci			# OHCI PCI->USB interface
 device		ehci			# EHCI PCI->USB interface (USB 2.0)
@@ -375,6 +376,7 @@ device		xhci			# XHCI PCI->USB interface (USB 3.0)
 device		usb			# USB Bus (required)
 device		ukbd			# Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
+
 # USB Serial devices
 device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
 device		uark		# Technologies ARK3116 based serial adapters
@@ -438,6 +440,7 @@ device		virtio_scsi		# VirtIO SCSI device
 device		virtio_balloon		# VirtIO Memory Balloon device
 
 # HyperV drivers and enchancement support
+options		HYPERV			# Hyper-V kernel infrastructure
 device		hyperv			# HyperV drivers 
 
 # Xen HVM Guest Optimizations
@@ -474,6 +477,7 @@ device		hifn
 device		enc
 device		cryptodev
 options		IPSEC_NAT_T
+options		TCP_SIGNATURE       #include support for RFC 2385
 
 options		ALTQ
 options		ALTQ_CBQ
@@ -599,7 +603,6 @@ options		VIMAGE
 #device		epair
 device		stf
 
-# NETMAP subsystem
 device		netmap
 
 device		rlswitch