--- elwix/config/Attic/ELWIX 2012/04/08 16:35:05 1.3.2.7 +++ elwix/config/Attic/ELWIX 2012/05/30 07:07:44 1.3.2.11 @@ -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.562 2012/01/31 19:38:18 jimharris Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.571 2012/05/10 12:37:32 mav Exp $ cpu I486_CPU cpu I586_CPU @@ -26,6 +26,7 @@ ident ELWIX 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 options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption @@ -40,6 +41,8 @@ options UFS_GJOURNAL # Enable gjournal-based UFS jou options MD_ROOT # MD is a potential root device 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 @@ -50,18 +53,13 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. options GEOM_LABEL # Provides labelization options GEOM_UZIP -options GEOM_JOURNAL options GEOM_ELI options GEOM_MIRROR options GEOM_CONCAT options GEOM_STRIPE options GEOM_VIRSTOR -options GEOM_SHSEC -options GEOM_RAID3 options GEOM_CACHE options GEOM_MULTIPATH -options GEOM_NOP -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 @@ -86,6 +84,7 @@ 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 INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging support. Always need this: @@ -194,6 +193,7 @@ device psm # PS/2 mouse device kbdmux # keyboard multiplexer device vga # VGA video card driver +options VESA # Add support for VESA BIOS Extensions (VBE) device splash # Splash screen and screen saver support @@ -256,9 +256,12 @@ device ale # Atheros AR8121/AR8113/AR8114 Ethernet device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet +#device cas # Sun Cassini/Cassini+ and NS DP83065 Saturn device dc # DEC/Intel 21143 and various workalikes device et # Agere ET1310 10/100/Gigabit Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) +#device gem # Sun GEM/Sun ERI/Apple GMAC +#device hme # Sun HME (Happy Meal Ethernet) device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet device lge # Level 1 LXT1001 gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet @@ -293,11 +296,11 @@ device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet -options ATH_ENABLE_11N 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 @@ -339,7 +342,6 @@ device random # Entropy device device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. -device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) @@ -357,13 +359,8 @@ device ohci # OHCI PCI->USB interface device ehci # EHCI PCI->USB interface (USB 2.0) device xhci # XHCI PCI->USB interface (USB 3.0) device usb # USB Bus (required) -#device udbp # USB Double Bulk Pipe devices (needs netgraph) -device uhid # "Human Interface Devices" device ukbd # Keyboard -device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse -device urio # Diamond Rio 500 MP3 player # USB Serial devices device u3g # USB-based 3G modems (Option, Huawei, Sierra) device uark # Technologies ARK3116 based serial adapters @@ -405,10 +402,12 @@ device dcons_crom # Configuration ROM for dcons # Sound support device sound # Generic sound driver (required) +device snd_cmi # CMedia CMI8338/CMI8738 +device snd_csa # Crystal Semiconductor CS461x/428x +device snd_emu10kx # Creative SoundBlaster Live! and Audigy device snd_es137x # Ensoniq AudioPCI ES137x device snd_hda # Intel High Definition Audio device snd_ich # Intel, NVidia and other ICH AC'97 Audio -device snd_uaudio # USB Audio device snd_via8233 # VIA VT8233x Audio # MMC/SD @@ -450,6 +449,7 @@ options ALTQ_RED options ALTQ_RIO options MROUTING +options RADIX_MPATH options PPS_SYNC options DEVICE_POLLING options HZ=1000 @@ -511,6 +511,7 @@ options VFS_AIO device ic device iic device iicsmb +#device iicoc # OpenCores I2C controller support device smb device smbus device iicbus @@ -520,11 +521,22 @@ options BKTR_NEW_MSP34XX_DRIVER options BKTR_KODICOM_MUX device speaker +device ds133x +device ds1374 +device ds1672 + +device intpm +device alpm +device ichsmb +device viapm +device amdpm +device amdsmb +device nfpm +device nfsmb + device ipmi device pcf -device mos - device gpio device gpioled device gpioiic @@ -533,8 +545,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 @@ -544,21 +554,22 @@ device nvram device ichwd device amdsbwd device viawd +device wbwd #device disc #device edsc +#options VIMAGE device epair device stf # NETMAP subsystem -#device netmap +###device netmap +device rlswitch + options ACCEPT_FILTER_DATA options ACCEPT_FILTER_DNS options ACCEPT_FILTER_HTTP options ZERO_COPY_SOCKETS options SW_WATCHDOG - -options RACCT -options RCTL