--- elwix/config/ELWIX_i386 2017/02/13 16:52:46 1.6 +++ elwix/config/ELWIX_i386 2018/07/03 22:03:59 1.6.2.5 @@ -1,5 +1,5 @@ -# $Id: ELWIX_i386,v 1.6 2017/02/13 16:52:46 misho Exp $ -# $FreeBSD: head/sys/i386/conf/GENERIC 310177 2016-12-16 21:10:37Z jhb $ +# $Id: ELWIX_i386,v 1.6.2.5 2018/07/03 22:03:59 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,15 @@ 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 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 @@ -79,20 +81,19 @@ 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 # Debugging support. Always need this: -#options KDB # Enable kernel debugger support. -#options KDB_TRACE # Print a stack trace for a panic. +options KDB # Enable kernel debugger support. +options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -#options DDB # Support DDB. -#options GDB # Support remote GDB. +options DDB # Support DDB. +options GDB # Support remote GDB. #options DEADLKRES # Enable the deadlock resolver #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS @@ -100,9 +101,16 @@ options RCTL # Resource limits #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 @@ -124,11 +132,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 @@ -216,8 +219,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 @@ -241,8 +242,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'') @@ -301,11 +300,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 @@ -341,7 +339,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 @@ -368,7 +365,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) @@ -376,6 +373,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 @@ -438,7 +436,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 @@ -454,17 +452,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 @@ -474,7 +474,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 @@ -596,11 +596,9 @@ device vxlan #device disc #device edsc -options VIMAGE #device epair device stf -# NETMAP subsystem device netmap device rlswitch @@ -612,4 +610,4 @@ options ACCEPT_FILTER_HTTP options SW_WATCHDOG device etherswitch -device rtl8366rb +#device rtl8366rb