--- elwix/config/ELWIX_i386	2017/12/27 21:13:00	1.6.2.4
+++ elwix/config/ELWIX_i386	2020/06/11 14:29:40	1.6.2.6
@@ -1,5 +1,5 @@
-# $Id: ELWIX_i386,v 1.6.2.4 2017/12/27 21:13:00 misho Exp $
-# $FreeBSD: head/sys/i386/conf/GENERIC 310177 2016-12-16 21:10:37Z jhb $
+# $Id: ELWIX_i386,v 1.6.2.6 2020/06/11 14:29:40 misho Exp $
+# $FreeBSD: head/sys/i386/conf/GENERIC 333890 2018-05-19 19:53:23Z markj $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -15,6 +15,13 @@ 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
 
+# UART chips on this platform
+device		uart_ns8250
+
+# enable support for native hardware
+device		atpic
+
+options 	NEW_PCIB
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
@@ -41,6 +48,10 @@ 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_PART_BSD
+options 	GEOM_PART_EBR
+options 	GEOM_PART_EBR_COMPAT
+options 	GEOM_PART_MBR
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 #options 	GEOM_GATE
@@ -101,6 +112,12 @@ options 	GDB			# Support remote GDB.
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
+# Kernel dump features.
+options 	EKCD			# Support for encrypted kernel dumps
+options 	GZIO			# gzip-compressed kernel and user dumps
+options 	ZSTDIO			# zstd-compressed kernel and user dumps
+options 	NETDUMP			# netdump(4) client support
+
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
@@ -110,6 +127,8 @@ options 	EARLY_AP_STARTUP
 device		cpufreq
 
 # Bus support.
+device		isa
+options 	ISAPNP
 device		acpi
 device		pci
 options 	PCI_HP			# PCI-Express native HotPlug
@@ -126,11 +145,6 @@ device		siis			# SiliconImage SiI3124/SiI3132/SiI3531 
 
 # SCSI Controllers
 device		ahc			# AHA2940 and onboard AIC7xxx devices
-#options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-#device		ahd			# AHA39320/29320 and onboard AIC79xx devices
-#options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
 device		esp			# AMD Am53C974 (Tekram DC-390(T))
 device		hptiop			# Highpoint RocketRaid 3xxx series
 device		isp			# Qlogic family
@@ -218,8 +232,6 @@ device		agp			# support several AGP chipsets
 
 # Power management support (see NOTES for more options)
 #device		apm
-# Add suspend/resume support for the i8254.
-device		pmtimer
 
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
@@ -243,7 +255,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		ixgb			# Intel PRO/10GbE Ethernet Card
 device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp			# 3Com 3cR990 (``Typhoon'')
@@ -302,7 +313,6 @@ device		ed			# NE[12]000, SMC Ultra, 3c503, DS8390 car
 device		ex			# Intel EtherExpress Pro/10 and Pro/10+
 device		ep			# Etherlink III based cards
 device		fe			# Fujitsu MB8696x based cards
-device		ie			# EtherExpress 8/16, 3C507, StarLAN 10 etc.
 device		sn			# SMC's 9000 series of Ethernet chips
 device		xe			# Xircom pccard Ethernet
 
@@ -351,6 +361,8 @@ device		mwlfw
 device		wpifw
 
 # Pseudo devices.
+device		mem		# Memory and kernel memory devices
+device		io		# I/O device
 device		loop			# Network loopback
 device		random			# Entropy device
 device		padlock_rng		# VIA Padlock RNG
@@ -467,9 +479,7 @@ device		gre
 device		lagg
 device		carp
 
-device		siba_bwn
-
-#options		NDISAPI
+#options	NDISAPI
 #device		ndis
 
 device		pf