--- elwix/config/ELWIX_amd64	2018/07/09 21:22:05	1.2.2.5
+++ elwix/config/ELWIX_amd64	2019/09/26 13:02:34	1.2.2.6
@@ -1,4 +1,4 @@
-# $Id: ELWIX_amd64,v 1.2.2.5 2018/07/09 21:22:05 misho Exp $
+# $Id: ELWIX_amd64,v 1.2.2.6 2019/09/26 13:02:34 misho Exp $
 # $FreeBSD: head/sys/amd64/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $
 
 cpu		HAMMER
@@ -14,6 +14,7 @@ makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug
 makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
 options 	SCHED_ULE		# ULE scheduler
+options 	NUMA			# Non-Uniform Memory Architecture support
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
@@ -40,10 +41,9 @@ options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
-#options 	GEOM_GATE
+options 	EFIRT			# EFI Runtime Services support
 options 	GEOM_MAP
 options 	GEOM_UZIP
 #device		geom_redboot
@@ -56,8 +56,6 @@ options		GEOM_STRIPE
 options		GEOM_VIRSTOR
 options		GEOM_CACHE
 options		GEOM_MULTIPATH
-#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
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -147,17 +145,12 @@ 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
-
-device		adv			# Advansys SCSI adapters
-device		adw			# Advansys wide SCSI adapters
-device		aic			# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
-device		bt			# Buslogic/Mylex MultiMaster SCSI adapters
 device		isci			# Intel C600 SAS controller
 device		ocs_fc			# Emulex FC adapters
 
 # ATA/SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
-#device		ch			# SCSI media changers
+device		ch			# SCSI media changers
 device		da			# Direct Access (disks)
 device		sa			# Sequential Access (tape etc)
 device		cd			# CD
@@ -245,8 +238,9 @@ device		de			# DEC/Intel DC21x4x (``Tulip'')
 device		em			# Intel PRO/1000 Gigabit Ethernet Family
 device		ix			# Intel PRO/10GbE PCIE PF Ethernet
 device		ixv			# Intel PRO/10GbE PCIE VF Ethernet
-device		ixl			# Intel XL710 40Gbe PCIE Ethernet
-#options		IXL_IW			# Enable iWARP Client Interface in ixl(4)
+device		ixl			# Intel 700 Series Physical Function
+device		iavf			# Intel Adaptive Virtual Function
+#option		IXL_IW			# Enable iWARP Client Interface in ixl(4)
 #device		ixlv			# Intel XL710 40Gbe VF PCIE Ethernet
 device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
@@ -335,6 +329,7 @@ device		mwlfw
 device		wpifw
 
 # Pseudo devices.
+device		crypto			# core crypto support
 device		loop			# Network loopback
 device		random			# Entropy device
 device		padlock_rng		# VIA Padlock RNG
@@ -437,9 +432,6 @@ device		vmx			# VMware VMXNET3 Ethernet
 # Netmap provides direct access to TX/RX rings on supported NICs
 device		netmap			# netmap(4) support
 
-# The crypto framework is required by IPSEC
-device		crypto			# Required by IPSEC
-
 ### ELWIX Additional custom settings ...
 
 # Add multiple route table support
@@ -463,7 +455,7 @@ device		carp
 
 #device		siba_bwn
 
-#options		NDISAPI
+#options	NDISAPI
 #device		ndis
 
 device		pf
@@ -551,9 +543,9 @@ device		smb
 device		smbus
 device		iicbus
 device		iicbb
-device		bktr
-options		BKTR_NEW_MSP34XX_DRIVER
-options		BKTR_KODICOM_MUX
+#device		bktr
+#options		BKTR_NEW_MSP34XX_DRIVER
+#options		BKTR_KODICOM_MUX
 device		speaker
 
 device		ds133x