--- elwix/config/ELWIX_i386	2016/09/29 14:38:29	1.5.2.3
+++ elwix/config/ELWIX_i386	2021/03/11 13:59:50	1.7
@@ -1,5 +1,5 @@
-# $Id: ELWIX_i386,v 1.5.2.3 2016/09/29 14:38:29 misho Exp $
-# $FreeBSD: head/sys/i386/conf/GENERIC 299142 2016-05-05 22:26:23Z jhb $
+# $Id: ELWIX_i386,v 1.7 2021/03/11 13:59:50 misho Exp $
+# $FreeBSD: head/sys/i386/conf/GENERIC 333890 2018-05-19 19:53:23Z markj $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -13,13 +13,23 @@ hints		"ELWIX_i386.hints"	# Default places to look for
 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
 
+# 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
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
+options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
+options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	TCP_OFFLOAD		# TCP offload
 options 	SCTP			# Stream Control Transmission Protocol
 options 	FFS			# Berkeley Fast Filesystem
@@ -38,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
@@ -45,8 +59,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 +75,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,10 +92,9 @@ 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
 options 	RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
 options 	RCTL			# Resource limits
@@ -99,14 +112,23 @@ 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
+options 	EARLY_AP_STARTUP
 
 # CPU frequency control
 device		cpufreq
 
 # Bus support.
+device		isa
+options 	ISAPNP
 device		acpi
 device		pci
 options 	PCI_HP			# PCI-Express native HotPlug
@@ -123,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
@@ -215,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
@@ -240,8 +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		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
 device		txp			# 3Com 3cR990 (``Typhoon'')
@@ -300,11 +313,10 @@ 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
 
-options		XBONEHACK
+#options		XBONEHACK
 device		wlan_acl
 device		wlan_xauth
 device		wlan_rssadapt
@@ -340,7 +352,6 @@ device		malo			# Marvell Libertas wireless NICs.
 device		mwl			# Marvell 88W8363 802.11n wireless NICs.
 device		ral			# Ralink Technology RT2500 wireless NICs.
 device		wi			# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl			# Older non 802.11 Wavelan wireless NIC.
 device		wpi			# Intel 3945ABG wireless NICs.
 
 device		iwifw
@@ -350,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
@@ -367,7 +380,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 +388,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
@@ -437,7 +451,7 @@ device		virtio_blk		# VirtIO Block device
 device		virtio_scsi		# VirtIO SCSI device
 device		virtio_balloon		# VirtIO Memory Balloon device
 
-# HyperV drivers and enchancement support
+# HyperV drivers and enhancement support
 device		hyperv			# HyperV drivers 
 
 # Xen HVM Guest Optimizations
@@ -453,17 +467,19 @@ device		crypto			# Required by IPSEC
 
 ### ELWIX Additional custom settings ...
 
-#device		iscsi_initiator
+# Add multiple route table support
+#options     ROUTETABLES=16
 
+device		iscsi
+#device		iser
+
 device		if_bridge
 device		tap
 device		gre
 device		lagg
 device		carp
 
-device		siba_bwn
-
-#options		NDISAPI
+#options	NDISAPI
 #device		ndis
 
 device		pf
@@ -473,7 +489,7 @@ device		pfsync
 device		hifn
 device		enc
 device		cryptodev
-options		IPSEC_NAT_T
+options		TCP_SIGNATURE       #include support for RFC 2385
 
 options		ALTQ
 options		ALTQ_CBQ
@@ -595,11 +611,9 @@ device		vxlan
 
 #device		disc
 #device		edsc
-options		VIMAGE
 #device		epair
 device		stf
 
-# NETMAP subsystem
 device		netmap
 
 device		rlswitch
@@ -611,4 +625,4 @@ options 	ACCEPT_FILTER_HTTP
 options 	SW_WATCHDOG
 
 device		etherswitch
-device		rtl8366rb
+#device		rtl8366rb