--- elwix/config/Attic/ELWIX 2012/05/21 11:24:31 1.3.2.8 +++ elwix/config/Attic/ELWIX 2012/11/14 13:40:15 1.4.2.1 @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.571 2012/05/10 12:37:32 mav Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.579 2012/10/01 21:42:32 ken Exp $ cpu I486_CPU cpu I586_CPU @@ -28,13 +28,11 @@ 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 -device hwpmc # Driver (also a loadable module) -options HWPMC_HOOKS # Other necessary kernel hooks - options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options TCP_OFFLOAD # TCP offload options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support @@ -46,8 +44,7 @@ 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 NFSLOCKD #Network Lock Manager -options MD_ROOT_SIZE=8000 +options MD_ROOT_SIZE=8400 options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem @@ -57,6 +54,7 @@ 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_UZIP options GEOM_ELI options GEOM_MIRROR @@ -65,7 +63,6 @@ options GEOM_STRIPE options GEOM_VIRSTOR options GEOM_CACHE options GEOM_MULTIPATH -options GEOM_AES # Don't use, use GEOM_BDE options GEOM_LINUX_LVM # Linux LVM2 volumes options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty) options COMPAT_FREEBSD4 # Compatible with FreeBSD4 @@ -88,9 +85,9 @@ options AUDIT # Security event auditing options CAPABILITY_MODE # Capsicum capability mode options CAPABILITIES # Capsicum capabilities options MAC # TrustedBSD MAC Framework -options FLOWTABLE # per-cpu routing cache #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 # Debugging support. Always need this: @@ -143,6 +140,7 @@ device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family #device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion +device mps # LSI-Logic MPT-Fusion 2 #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') device trm # Tekram DC395U/UW/F DC315U adapters @@ -176,6 +174,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx +device hpt27xx # Highpoint RocketRAID 27xx device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID @@ -306,7 +305,6 @@ options XBONEHACK options WLCACHE device wlan_acl device wlan_xauth -options ATH_ENABLE_11N options IEEE80211_SUPPORT_TDMA options IEEE80211_SUPPORT_SUPERG # Wireless NIC cards @@ -319,10 +317,12 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. -device ath # Atheros NIC's +device ath # Atheros NICs device ath_pci # Atheros pci/cardbus glue device ath_hal # pci/cardbus chip support options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation +options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath device bwi # Broadcom BCM430x/BCM431x wireless NICs. device bwn # Broadcom BCM43xx wireless NICs. @@ -345,6 +345,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 ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. @@ -431,7 +433,7 @@ device carp device siba_bwn -#options NDISAPI +options NDISAPI #device ndis device pf @@ -517,7 +519,7 @@ options VFS_AIO device ic device iic device iicsmb -device iicoc # OpenCores I2C controller support +#device iicoc # OpenCores I2C controller support device smb device smbus device iicbus @@ -540,12 +542,9 @@ device amdsmb device nfpm device nfsmb -device smb device ipmi device pcf -device mos - device gpio device gpioled device gpioiic @@ -554,8 +553,6 @@ device glxsb device glxiic options CPU_GEODE options CPU_SOEKRIS -options CPU_ELAN -options CPU_ELAN_PPS options COMPAT_AOUT options ENABLE_ALART # Control alarm on Intel intpm driver options PANIC_REBOOT_WAIT_TIME=10 @@ -569,13 +566,13 @@ device wbwd #device disc #device edsc +options VIMAGE device epair device stf # NETMAP subsystem -device netmap +#device netmap -device mdio device rlswitch options ACCEPT_FILTER_DATA @@ -584,6 +581,3 @@ options ACCEPT_FILTER_HTTP options ZERO_COPY_SOCKETS options SW_WATCHDOG - -options RACCT -options RCTL