--- elwix/config/ELWIX_amd64	2019/09/26 13:02:34	1.2.2.6
+++ elwix/config/ELWIX_amd64	2020/06/11 00:52:48	1.2.2.7
@@ -1,11 +1,23 @@
-# $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 $
+# $Id: ELWIX_amd64,v 1.2.2.7 2020/06/11 00:52:48 misho Exp $
+# $FreeBSD: stable/12/sys/amd64/conf/GENERIC 354439 2019-11-07 13:01:09Z hselasky $
 
 cpu		HAMMER
 ident		ELWIX_amd64
+machine		amd64
 
-#include		DEFAULTS
+# Bus support.
+device		isa
 
+# Pseudo devices.
+device		mem		# Memory and kernel memory devices
+device		io		# I/O device
+
+# UART chips on this platform
+device		uart_ns8250
+device		superio
+
+options 	NEW_PCIB
+
 hints		"ELWIX_amd64.hints"	# Default places to look for devices.
 
 options 	INIT_PATH=/sbin/initx:/sbin/init
@@ -49,6 +61,12 @@ options 	GEOM_UZIP
 #device		geom_redboot
 device		geom_map	# to get access to the SPI flash partitions
 device		geom_uzip	# compressed in-memory filesystem support
+device		xz
+options 	GEOM_PART_BSD
+options 	GEOM_PART_EBR
+options 	GEOM_PART_EBR_COMPAT
+options 	GEOM_PART_MBR
+options 	GEOM_PART_GPT
 options         GEOM_ELI
 options         GEOM_MIRROR
 options		GEOM_CONCAT
@@ -232,14 +250,18 @@ device		ppi			# Parallel port interface device
 
 device		puc			# Multi I/O cards and multi-channel UARTs
 
-# PCI Ethernet NICs.
-device		bxe			# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
-device		de			# DEC/Intel DC21x4x (``Tulip'')
+# PCI/PCI-X/PCIe Ethernet NICs that use iflib infrastructure
+device		iflib
 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 700 Series Physical Function
 device		iavf			# Intel Adaptive Virtual Function
+device		vmx			# VMware VMXNET3 Ethernet
+
+# PCI Ethernet NICs.
+device		bxe			# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
+device		de			# DEC/Intel DC21x4x (``Tulip'')
 #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
@@ -336,7 +358,7 @@ 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.
+device		tuntap			# Packet tunnel.
 device		md			# Memory "disks"
 device		gif			# IPv6 and IPv4 tunneling
 device		firmware		# firmware assist module
@@ -426,12 +448,14 @@ device		hyperv			# HyperV drivers 
 options 	XENHVM			# Xen HVM kernel infrastructure
 device		xenpci			# Xen HVM Hypervisor services driver
 
-# VMware support
-device		vmx			# VMware VMXNET3 Ethernet
-
 # Netmap provides direct access to TX/RX rings on supported NICs
 device		netmap			# netmap(4) support
 
+# evdev interface
+options 	EVDEV_SUPPORT		# evdev support in legacy drivers
+device		evdev			# input event device support
+device		uinput			# install /dev/uinput cdev
+
 ### ELWIX Additional custom settings ...
 
 # Add multiple route table support
@@ -448,7 +472,6 @@ device      oce     # Device driver for Emulex OneConn
 #device		iscsi_initiator
 
 device		if_bridge
-device		tap
 device		gre
 device		lagg
 device		carp