--- elwix/config/ELWIX_i386 2015/05/11 23:41:49 1.5.2.2 +++ elwix/config/ELWIX_i386 2016/09/29 14:38:29 1.5.2.3 @@ -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.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 $ cpu I486_CPU cpu I586_CPU @@ -19,6 +19,7 @@ options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options IPSEC # IP (v4/v6) security options TCP_OFFLOAD # TCP offload options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem @@ -28,8 +29,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 +40,13 @@ 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 options GEOM_ELI options GEOM_MIRROR options GEOM_CONCAT @@ -53,7 +54,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 @@ -79,15 +80,18 @@ 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 INCLUDE_CONFIG_FILE # Include this file in kernel options FLOWTABLE # per-cpu routing cache -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 @@ -105,6 +109,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,7 +118,6 @@ 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 @@ -170,7 +174,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 +183,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 @@ -297,7 +305,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 @@ -431,8 +438,6 @@ 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 device hyperv # HyperV drivers # Xen HVM Guest Optimizations @@ -443,6 +448,9 @@ 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 @@ -464,11 +472,8 @@ device pfsync device hifn device enc -device crypto device cryptodev -options IPSEC options IPSEC_NAT_T -options IPSEC_FILTERTUNNEL options ALTQ options ALTQ_CBQ @@ -538,8 +543,6 @@ options NULLFS options UNIONFS options TMPFS -options VFS_AIO - device ic device iic device iicsmb @@ -588,14 +591,16 @@ 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