--- elwix/config/ELWIX_amd64 2016/12/22 14:23:21 1.1.2.4 +++ elwix/config/ELWIX_amd64 2017/06/09 14:54:00 1.2.2.2 @@ -1,4 +1,4 @@ -# $Id: ELWIX_amd64,v 1.1.2.4 2016/12/22 14:23:21 misho Exp $ +# $Id: ELWIX_amd64,v 1.2.2.2 2017/06/09 14:54:00 misho Exp $ # $FreeBSD: head/sys/amd64/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $ cpu HAMMER @@ -11,7 +11,7 @@ hints "ELWIX_amd64.hints" # Default places to look fo 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 @@ -40,12 +40,11 @@ options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization #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 +52,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_FREEBSD32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 @@ -62,6 +61,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 @@ -88,13 +88,13 @@ options RCTL # Resource limits options FLOWTABLE # per-cpu routing cache # 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 BUF_TRACKING # Track buffer history -#options DDB # Support DDB. +options DDB # Support DDB. #options FULL_BUF_TRACKING # Track more buffer history -#options GDB # Support remote GDB. +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 @@ -105,6 +105,7 @@ options FLOWTABLE # per-cpu routing cache # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel options DEVICE_NUMA # I/O Device Affinity +options EARLY_AP_STARTUP # CPU frequency control device cpufreq @@ -151,7 +152,7 @@ device isci # Intel C600 SAS controller # ATA/SCSI peripherals device scbus # SCSI bus (required for ATA/SCSI) -device ch # SCSI media changers +#device ch # SCSI media changers device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD @@ -236,10 +237,10 @@ 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 ix # Intel PRO/10GbE PCIE PF Ethernet device ixv # Intel PRO/10GbE PCIE VF Ethernet device ixl # Intel XL710 40Gbe PCIE Ethernet +options IXL_IW # Enable iWARP Client Interface in ixl(4) device ixlv # Intel XL710 40Gbe VF PCIE Ethernet device le # AMD Am7900 LANCE and Am79C9xx PCnet device ti # Alteon Networks Tigon I/II gigabit Ethernet @@ -294,7 +295,6 @@ device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet options XBONEHACK -options WLCACHE device wlan_acl device wlan_xauth device wlan_rssadapt @@ -356,7 +356,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) @@ -438,8 +438,26 @@ device xenpci # Xen HVM Hypervisor services driver # VMware support device vmx # VMware VMXNET3 Ethernet +# Netmap provides direct access to TX/RX rings on supported NICs +device netmap # netmap(4) support + +# The crypto framework is required by IPSEC +device crypto # Required by IPSEC + ### ELWIX Additional custom settings ... +# Add multiple route table support +options ROUTETABLES=16 + +device cxgb # Chelsio T3 10 Gigabit Ethernet adapter driver +device cxgb_t3fw # Chelsio T3 10 Gigabit Ethernet firmware +device cxgbe # Chelsio T4 10Gb and 1Gb Ethernet adapter driver +device my # Myson Technology Ethernet PCI driver +device mxge # Myricom Myri10GE 10 Gigabit Ethernet adapter driver +device nxge # Neterion Xframe 10GbE Server/Storage adapter driver +device qlxge # QLogic 8100 Series 10 Gigabit Ethernet +device oce # Device driver for Emulex OneConnect 10Gb network adapters + #device iscsi_initiator device if_bridge @@ -459,11 +477,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 @@ -533,8 +548,6 @@ options NULLFS options UNIONFS options TMPFS -options VFS_AIO - device ic device iic device iicsmb @@ -581,12 +594,9 @@ device wbwd #device disc #device edsc options VIMAGE -device epair +#device epair device stf -# NETMAP subsystem -#device netmap - device rlswitch options ACCEPT_FILTER_DATA @@ -596,4 +606,4 @@ options ACCEPT_FILTER_HTTP options SW_WATCHDOG device etherswitch -device rtl8366rb +#device rtl8366rb