--- elwix/config/ELWIX_i386	2021/07/16 18:35:50	1.8
+++ elwix/config/ELWIX_i386	2021/09/08 12:07:28	1.8.2.1
@@ -1,6 +1,7 @@
-# $Id: ELWIX_i386,v 1.8 2021/07/16 18:35:50 misho Exp $
+# $Id: ELWIX_i386,v 1.8.2.1 2021/09/08 12:07:28 misho Exp $
 # $FreeBSD$
 
+machine		i386
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
@@ -15,11 +16,16 @@ 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
 
+# Pseudo devices.
+device		mem		# Memory and kernel memory devices
+device		io		# I/O device
+
 # UART chips on this platform
 device		uart_ns8250
 
 # enable support for native hardware
 device		atpic
+options 	NEW_PCIB
 
 options 	NEW_PCIB
 options 	SCHED_ULE		# ULE scheduler
@@ -242,6 +248,7 @@ device		puc			# Multi I/O cards and multi-channel UART
 
 # PCI/PCI-X/PCIe Ethernet NICs that use iflib infrastructure
 device		iflib
+device		igc			# Intel I225 2.5G Ethernet
 device		em			# Intel PRO/1000 Gigabit Ethernet Family
 device		vmx			# VMware VMXNET3 Ethernet
 
@@ -265,7 +272,6 @@ device		dc			# DEC/Intel 21143 and various workalikes
 device		et			# Agere ET1310 10/100/Gigabit Ethernet
 device		fxp			# Intel EtherExpress PRO/100B (82557, 82558)
 #device		gem			# Sun GEM/Sun ERI/Apple GMAC
-#device		hme			# Sun HME (Happy Meal Ethernet)
 device		jme			# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
 device		lge			# Level 1 LXT1001 gigabit Ethernet
 device		msk			# Marvell/SysKonnect Yukon II Gigabit Ethernet
@@ -301,7 +307,6 @@ device		wlan_wep		# 802.11 WEP support
 device		wlan_ccmp		# 802.11 CCMP support
 device		wlan_tkip		# 802.11 TKIP support
 device		wlan_amrr		# AMRR transmit rate control algorithm
-device		an			# Aironet 4500/4800 802.11 wireless NICs.
 device		ath			# Atheros NICs
 device		ath_pci			# Atheros pci/cardbus glue
 device		ath_hal			# pci/cardbus chip support
@@ -424,12 +429,16 @@ device		virtio_scsi		# VirtIO SCSI device
 device		virtio_balloon		# VirtIO Memory Balloon device
 
 # HyperV drivers and enhancement support
-device		hyperv			# HyperV drivers 
+# NOTE: HYPERV depends on hyperv.  They must be added or removed together.
+options 	HYPERV			# Kernel support for HyperV drivers
+device		hyperv			# HyperV drivers
 
 # Xen HVM Guest Optimizations
-# NOTE: XENHVM depends on xenpci.  They must be added or removed together.
+# NOTE: XENHVM and xenpci interdepend.  They must be added or removed
+# together.  xentimer depends on XENHVM and isn't required.
 options 	XENHVM			# Xen HVM kernel infrastructure
 device		xenpci			# Xen HVM Hypervisor services driver
+device		xentimer		# Xen x86 PV timer device
 
 # evdev interface
 options 	EVDEV_SUPPORT		# evdev support in legacy drivers