Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.914.2.3 retrieving revision 1.915 diff -u -p -r1.914.2.3 -r1.915 --- src/sys/arch/i386/conf/GENERIC 2009/04/28 07:34:07 1.914.2.3 +++ src/sys/arch/i386/conf/GENERIC 2008/10/29 11:56:53 1.915 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.914.2.3 2009/04/28 07:34:07 skrll Exp $ +# $NetBSD: GENERIC,v 1.915 2008/10/29 11:56:53 joerg Exp $ # # GENERIC machine description file # @@ -22,15 +22,12 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.914.2.3 $" +#ident "GENERIC-$Revision: 1.915 $" maxusers 64 # estimated number of users -# For GENERIC, we build the exec formats as modules by default. -no options EXEC_AOUT # exec a.out binaries -no options EXEC_ELF32 # exec ELF binaries -no options EXEC_SCRIPT # exec #! scripts -no options COREDUMP +makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, + # tune for more modern # CPU-related options. options VM86 # virtual 8086 emulation @@ -96,10 +93,11 @@ options KTRACE # system call tracing v options SYSVMSG # System V-like message queues options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing -#options P1003_1B_SEMAPHORE # p1003.1b semaphore support -no options AIO # POSIX AIO, built as a module +options P1003_1B_SEMAPHORE # p1003.1b semaphore support +options LKM # loadable kernel modules options MODULAR # new style module framework +options APM_NO_IDLE # needed for SMP options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) @@ -112,15 +110,14 @@ options SYSCTL_INCLUDE_DESCR # Include #options BEEP_ONHALT_PITCH=1500 # Default frequency (in Hz) #options BEEP_ONHALT_PERIOD=250 # Default duration (in msecs) -# Alternate buffer queue strategies for better responsiveness under high -# disk I/O load. +# Enable experimental buffer queue strategy for better responsiveness under +# high disk I/O load. Likely stable but not yet the default. #options BUFQ_READPRIO -options BUFQ_PRIOCSCAN +#options BUFQ_PRIOCSCAN # Diagnostic/debugging support options #options DIAGNOSTIC # expensive kernel consistency checks #options DEBUG # expensive debugging checks/support -#options LOCKDEBUG # expensive locking checks/support #options KMEMSTATS # kernel memory statistics (vmstat -m) options DDB # in-kernel debugger #options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic' @@ -133,7 +130,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options SYSCALL_TIMES # per syscall times #options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) -# Compatibility options, built as modules by default +# Compatibility options options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI options COMPAT_09 # NetBSD 0.9 options COMPAT_10 # NetBSD 1.0 @@ -146,16 +143,15 @@ options COMPAT_16 # NetBSD 1.6 options COMPAT_20 # NetBSD 2.0 options COMPAT_30 # NetBSD 3.0 options COMPAT_40 # NetBSD 4.0 -options COMPAT_50 # NetBSD 5.0 options COMPAT_43 # 4.3BSD, 386BSD, and BSDI #options COMPAT_386BSD_MBRPART # recognize old partition ID #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -#options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -#options COMPAT_SVR4 # binary compatibility with SVR4 -#options COMPAT_IBCS2 # binary compatibility with SCO and ISC -#options COMPAT_LINUX # binary compatibility with Linux -#options COMPAT_FREEBSD # binary compatibility with FreeBSD +options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility +options COMPAT_SVR4 # binary compatibility with SVR4 +options COMPAT_IBCS2 # binary compatibility with SCO and ISC +options COMPAT_LINUX # binary compatibility with Linux +options COMPAT_FREEBSD # binary compatibility with FreeBSD #options COMPAT_MACH # binary compatibility with Mach binaries #options COMPAT_DARWIN # binary compatibility with Darwin binaries #options EXEC_MACHO # exec MACH-O binaries @@ -170,36 +166,39 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges -# File systems, built as modules by default -#file-system FFS # UFS -#file-system EXT2FS # second extended file system (linux) -#file-system LFS # log-structured file system -#file-system MFS # memory file system -#file-system NFS # Network File System client -#file-system NTFS # Windows/NT file system (experimental) -#file-system CD9660 # ISO 9660 + Rock Ridge file system -#file-system MSDOSFS # MS-DOS file system -#file-system FDESC # /dev/fd -#file-system KERNFS # /kern -#file-system NULLFS # loopback file system -#file-system OVERLAY # overlay file system -#file-system PORTAL # portal filesystem (still experimental) -#file-system PROCFS # /proc -#file-system UMAPFS # NULLFS + uid and gid remapping -#file-system UNION # union file system -#file-system CODA # Coda File System; also needs vcoda (below) -#file-system SMBFS # experimental - CIFS; also needs nsmb (below) -#file-system PTYFS # /dev/ptm support -#file-system TMPFS # Efficient memory file-system +# File systems +file-system FFS # UFS +file-system EXT2FS # second extended file system (linux) +file-system LFS # log-structured file system +file-system MFS # memory file system +file-system NFS # Network File System client +file-system NTFS # Windows/NT file system (experimental) +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +file-system NULLFS # loopback file system +file-system OVERLAY # overlay file system +file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system +file-system CODA # Coda File System; also needs vcoda (below) +file-system SMBFS # experimental - CIFS; also needs nsmb (below) +file-system PTYFS # /dev/ptm support +file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system #file-system HFS # experimental - Apple HFS+ (read-only) # File system options -#options QUOTA # UFS quotas +options QUOTA # UFS quotas #options FFS_EI # FFS Endian Independent support +options SOFTDEP # FFS soft updates support. options WAPBL # File system journaling support - Experimental +# Note that UFS_DIRHASH is suspected of causing kernel memory corruption. +# It is not recommended for general use. #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental -#options NFSSERVER # Network File System server +options NFSSERVER # Network File System server #options FFS_NO_SNAPSHOT # No FFS snapshot support #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. @@ -217,8 +216,8 @@ options INET6 # IPV6 #options ISO,TPIP # OSI #options EON # OSI tunneling over IP options NETATALK # AppleTalk networking protocols -#options PPP_BSDCOMP # BSD-Compress compression support for PPP -#options PPP_DEFLATE # Deflate compression support for PPP +options PPP_BSDCOMP # BSD-Compress compression support for PPP +options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support @@ -527,19 +526,26 @@ pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse #options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads -options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads vga0 at isa? vga* at pci? dev ? function ? pcdisplay0 at isa? # CGA, MDA, EGA, HGA -genfb* at pci? dev ? function ? #machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver wsdisplay* at vga? console ? wsdisplay* at pcdisplay? console ? -wsdisplay* at wsemuldisplaydev? #wsdisplay* at machfb? console ? wskbd* at pckbd? console ? wsmouse* at pms? mux 0 +# VESA framebuffer console +#options KVM86 # required for vesabios +#vesabios* at vesabiosbus? +#vesafb* at vesabios? +#options VESAFB_WIDTH=640 +#options VESAFB_HEIGHT=480 +#options VESAFB_DEPTH=8 +#options VESAFB_PM # power management support +#wsdisplay* at vesafb? console ? + # VIA Unichrome framebuffer console #unichromefb* at pci? dev ? function ? #wsdisplay* at unichromefb? @@ -883,9 +889,7 @@ ed* at edc? # Network Interfaces # PCI network interfaces -age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) -ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet @@ -1023,7 +1027,6 @@ le* at mca? slot ? # SKNET Personal/MC # MII/PHY support acphy* at mii? phy ? # Altima AC101 and AMD Am79c874 PHYs amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs -atphy* at mii? phy ? # Attansic/Atheros PHYs bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs @@ -1240,15 +1243,6 @@ fwip* at ieee1394if? # IP over IEEE139 sbp* at ieee1394if? euihi ? euilo ? # SCSI over IEEE1394 -# SD/MMC/SDIO Controller and Device support - -# SD/MMC controller -sdhc* at pci? # SD Host Controller -sdmmc* at sdhc? # SD/MMC bus - -ld* at sdmmc? - - # Audio Devices # PCI audio devices @@ -1267,7 +1261,6 @@ esa* at pci? dev ? function ? # ESS Alle esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive fms* at pci? dev ? function ? # Forte Media FM801 -gcscaudio* at pci? dev ? function ? # AMD Geode CS5536 Companion Audio neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio sv* at pci? dev ? function ? # S3 SonicVibes yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio @@ -1365,9 +1358,6 @@ radio* at bktr? bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139 -# Bluetooth SDIO Controller -sbt* at sdmmc? - # Bluetooth USB Controllers ubt* at uhub? port ? @@ -1376,7 +1366,6 @@ bthub* at bcsp? bthub* at bt3c? bthub* at btbc? bthub* at btuart? -bthub* at sbt? bthub* at ubt? # Bluetooth HID support @@ -1499,9 +1488,9 @@ pseudo-device agr # IEEE 802.3ad link #pseudo-device srt # source-address-based routing # -# accept filters, built as modules by default -#pseudo-device accf_data # "dataready" accept filter -#pseudo-device accf_http # "httpready" accept filter +# accept filters +pseudo-device accf_data # "dataready" accept filter +pseudo-device accf_http # "httpready" accept filter # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals @@ -1516,10 +1505,10 @@ pseudo-device bcsp # BlueCore Serial P pseudo-device btuart # Bluetooth HCI UART (H4) # a pseudo device needed for Coda # also needs CODA (above) -#pseudo-device vcoda 4 # coda minicache <-> venus comm. +pseudo-device vcoda 4 # coda minicache <-> venus comm. # a pseudo device needed for SMBFS -#pseudo-device nsmb # experimental - SMB requester +pseudo-device nsmb # experimental - SMB requester # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor