--- elwix/config/ELWIX_i386 2013/07/17 15:01:44 1.1.2.1 +++ elwix/config/ELWIX_i386 2014/01/05 23:16:08 1.4.2.1 @@ -1,11 +1,13 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.583 2013/01/14 00:28:54 svnexp Exp $ -# $Id: ELWIX_i386,v 1.1.2.1 2013/07/17 15:01:44 misho Exp $ +# $Id: ELWIX_i386,v 1.4.2.1 2014/01/05 23:16:08 misho Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $ cpu I486_CPU cpu I586_CPU cpu I686_CPU -ident ELWIX +ident ELWIX_i386 +#include DEFAULTS + hints "ELWIX_i386.hints" # Default places to look for devices. options INIT_PATH=/sbin/initx:/sbin/init @@ -30,7 +32,6 @@ options NFSCL # New Network Filesystem Client options NFSD # New Network Filesystem Server options NFSCLIENT #Network File System client options NFSSERVER #Network File System server -options MD_ROOT_SIZE=8000 options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem @@ -42,12 +43,10 @@ options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options GEOM_GATE options GEOM_UZIP -options GEOM_REDBOOT -device geom_redboot +#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_MAP +#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 @@ -77,6 +76,7 @@ options HWPMC_HOOKS # Necessary kernel hooks for hwp options AUDIT # Security event auditing options CAPABILITY_MODE # Capsicum capability mode options CAPABILITIES # Capsicum capabilities +options PROCDESC # Support for process descriptors options MAC # TrustedBSD MAC Framework #options KDTRACE_HOOKS # Kernel DTrace hooks #options DDB_CTF # Kernel ELF linker loads CTF data @@ -85,9 +85,8 @@ options INCLUDE_CONFIG_FILE # Include this file i # Debugging support. Always need this: #options KDB # Enable kernel debugger support. -# For minimum debugger support (stable branch) use: #options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use this instead: +# For full debugger support use (turn off in stable branch): #options DDB # Support DDB. #options GDB # Support remote GDB. #options DEADLKRES # Enable the deadlock resolver @@ -115,7 +114,6 @@ device fdc # ATA controllers device ahci # AHCI-compatible SATA controllers device ata # Legacy ATA/SATA controllers -options ATA_CAM # Handle legacy controllers with CAM options ATA_STATIC_ID # Static device numbering device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA @@ -157,7 +155,7 @@ device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) device ses # Enclosure Services (SES and SAF-TE) -device ctl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID @@ -166,6 +164,7 @@ device asr # DPT SmartRAID V, VI and Adaptec SCSI RA device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device hptnr # Highpoint DC7280, R750 device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx device hpt27xx # Highpoint RocketRAID 27xx device iir # Intel Integrated RAID @@ -177,6 +176,7 @@ device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID cont # RAID controllers device aac # Adaptec FSA RAID device aacp # SCSI passthrough for aac (requires CAM) +device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family @@ -219,14 +219,13 @@ device uart # Generic UART driver device ppc device ppbus # Parallel port bus (required) device lpt # Printer -device plip # TCP/IP over parallel device ppi # Parallel port interface device #device vpo # Requires scbus and da device puc # Multi I/O cards and multi-channel UARTs # PCI Ethernet NICs. -device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet +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 @@ -300,6 +299,8 @@ device wlan_acl device wlan_xauth device wlan_rssadapt #options AH_RXCFG_SDMAMW_4BYTES +#options ATH_EEPROM_FIRMWARE # Use EEPROM from flash +options ALQ options IEEE80211_ALQ options IEEE80211_SUPPORT_TDMA options IEEE80211_SUPPORT_SUPERG @@ -341,8 +342,8 @@ device wpifw # Pseudo devices. device loop # Network loopback device random # Entropy device -options PADLOCK_RNG # VIA Padlock RNG -options RDRAND_RNG # Intel Bull Mountain RNG +device padlock_rng # VIA Padlock RNG +device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. @@ -427,10 +428,20 @@ device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device +# HyperV drivers +device hyperv # HyperV drivers + +# Xen HVM Guest Optimizations +# NOTE: XENHVM depends on xenpci. They must be added or removed together. +options XENHVM # Xen HVM kernel infrastructure +device xenpci # Xen HVM Hypervisor services driver + +# VMware support +device vmx # VMware VMXNET3 Ethernet + ### ELWIX Additional custom settings ... device if_bridge -device bridgestp device tap device gre device lagg @@ -438,7 +449,7 @@ device carp device siba_bwn -options NDISAPI +#options NDISAPI #device ndis device pf @@ -513,6 +524,9 @@ options NETGRAPH_BPF options NETGRAPH_GIF options NETGRAPH_GIF_DEMUX options NETGRAPH_BRIDGE +options NETGRAPH_VLAN +options NETGRAPH_PIPE +options NETGRAPH_CAR options NULLFS options UNIONFS