--- elwix/config/ELWIX_i386 2015/05/11 23:41:49 1.5.2.2 +++ elwix/config/ELWIX_i386 2017/12/27 21:13:00 1.6.2.4 @@ -1,5 +1,5 @@ -# $Id: ELWIX_i386,v 1.5.2.2 2015/05/11 23:41:49 misho Exp $ -# $FreeBSD: head/sys/i386/conf/GENERIC 282212 2015-04-29 10:12:34Z whu $ +# $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 $ cpu I486_CPU cpu I586_CPU @@ -13,12 +13,16 @@ 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 options FFS # Berkeley Fast Filesystem @@ -28,8 +32,8 @@ options UFS_DIRHASH # Improve performance on big dir options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem @@ -39,13 +43,12 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization -options GEOM_GATE +#options GEOM_GATE +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 -options GEOM_UNCOMPRESS +device geom_uzip # compressed in-memory filesystem support options GEOM_ELI options GEOM_MIRROR options GEOM_CONCAT @@ -53,7 +56,7 @@ options GEOM_STRIPE options GEOM_VIRSTOR options GEOM_CACHE options GEOM_MULTIPATH -options GEOM_LINUX_LVM # Linux LVM2 volumes +#options GEOM_LINUX_LVM # Linux LVM2 volumes options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty) options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 @@ -61,6 +64,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 @@ -77,17 +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 FLOWTABLE # per-cpu routing cache -options INCLUDE_CONFIG_FILE # Include this file in kernel +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 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 @@ -98,6 +104,7 @@ options INCLUDE_CONFIG_FILE # Include this file i # 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 @@ -105,6 +112,7 @@ device cpufreq # Bus support. device acpi device pci +options PCI_HP # PCI-Express native HotPlug options PCI_IOV # PCI SR-IOV support # Floppy drives @@ -113,16 +121,15 @@ device fdc # ATA controllers device ahci # AHCI-compatible SATA controllers device ata # Legacy ATA/SATA controllers -options ATA_STATIC_ID # Static device numbering device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug +#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 +#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 @@ -170,7 +177,6 @@ device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID device twa # 3ware 9000 series PATA/SATA RAID device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller -#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID # RAID controllers device aac # Adaptec FSA RAID @@ -180,9 +186,14 @@ device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s +device pmspcv # PMC-Sierra SAS/SATA Controller driver device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID +# NVM Express (NVMe) support +device nvme # base NVMe driver +device nvd # expose NVMe namespace as disks, depends on nvme + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -232,7 +243,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 @@ -296,8 +306,7 @@ device ie # EtherExpress 8/16, 3C507, StarLAN 10 et device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet -options XBONEHACK -options WLCACHE +#options XBONEHACK device wlan_acl device wlan_xauth device wlan_rssadapt @@ -333,7 +342,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 @@ -360,7 +368,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) @@ -368,6 +376,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 @@ -430,9 +439,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 -# NOTE: HYPERV depends on hyperv. They must be added or removed together. -options HYPERV # Hyper-V kernel infrastructure +# HyperV drivers and enhancement support device hyperv # HyperV drivers # Xen HVM Guest Optimizations @@ -443,10 +450,17 @@ device xenpci # Xen HVM Hypervisor services driver # VMware support device vmx # VMware VMXNET3 Ethernet +# The crypto framework is required by IPSEC +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 @@ -464,11 +478,8 @@ device pfsync device hifn device enc -device crypto device cryptodev -options IPSEC -options IPSEC_NAT_T -options IPSEC_FILTERTUNNEL +options TCP_SIGNATURE #include support for RFC 2385 options ALTQ options ALTQ_CBQ @@ -538,8 +549,6 @@ options NULLFS options UNIONFS options TMPFS -options VFS_AIO - device ic device iic device iicsmb @@ -588,14 +597,14 @@ device amdsbwd device viawd device wbwd +device vxlan + #device disc #device edsc -options VIMAGE -device epair +#device epair device stf -# NETMAP subsystem -#device netmap +device netmap device rlswitch @@ -606,4 +615,4 @@ options ACCEPT_FILTER_HTTP options SW_WATCHDOG device etherswitch -device rtl8366rb +#device rtl8366rb