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.779.2.4 retrieving revision 1.780 diff -u -p -r1.779.2.4 -r1.780 --- src/sys/arch/i386/conf/GENERIC 2007/02/06 16:55:40 1.779.2.4 +++ src/sys/arch/i386/conf/GENERIC 2006/09/10 02:28:33 1.780 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.779.2.4 2007/02/06 16:55:40 ad Exp $ +# $NetBSD: GENERIC,v 1.780 2006/09/10 02:28:33 riz Exp $ # # GENERIC machine description file # @@ -22,21 +22,18 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.779.2.4 $" +#ident "GENERIC-$Revision: 1.780 $" maxusers 32 # estimated number of users # CPU support. At least one is REQUIRED. -#options I386_CPU +options I386_CPU options I486_CPU options I586_CPU options I686_CPU -makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, - # tune for more modern - # CPU-related options. -#options MATH_EMULATE # floating point emulation +options MATH_EMULATE # floating point emulation options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE # insert delay no-ops in interrupts; recommended on very old machines @@ -50,13 +47,14 @@ options ENHANCED_SPEEDSTEP options POWERNOW_K7 # AMD PowerNow! and Cool`n'Quiet technology -options POWERNOW_K8 +options POWERNOW_K8 options MTRR # memory-type range register syscall support # doesn't work with MP just yet.. #options PERFCTRS # performance-monitoring counters support options MULTIBOOT # Multiboot support (see multiboot(8)) +#options MULTIBOOT_SYMTAB_SPACE=1048576 # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 @@ -140,7 +138,7 @@ options COMPAT_16 # NetBSD 1.6 options COMPAT_20 # NetBSD 2.0 options COMPAT_30 # NetBSD 3.0 options COMPAT_43 # 4.3BSD, 386BSD, and BSDI -#options COMPAT_386BSD_MBRPART # recognize old partition ID +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 @@ -175,7 +173,7 @@ 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 TMPFS # experimental - Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system # File system options @@ -267,12 +265,11 @@ options WSDISPLAY_COMPAT_SYSCONS # emul options WSDISPLAY_COMPAT_USL # VT handling options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes #options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode -#options WSKBD_USONLY # strip off non-US keymaps # don't attach pckbd as the console if no PS/2 keyboard is found options PCKBD_CNATTACH_MAY_FAIL # see dev/pckbport/wskbdmap_mfii.c for implemented layouts #options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver -#options UKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for ukbd driver +#options UKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for ukbd driver # allocate a number of virtual screens at autoconfiguration time #options WSDISPLAY_DEFAULTSCREENS=4 # use a large software cursor that doesn't blink @@ -318,9 +315,6 @@ cpu* at mainbus? # Basic Bus Support -#IPMI support -#ipmi0 at mainbus? - # Advanced Configuration and Power Interface # This option can be used to retrieve CPU and APIC information. @@ -609,8 +603,9 @@ iic* at piixpm? # SMBus on PIIX4 #nsclpcsio* at isa? #gpio* at nsclpcsio? -# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer -#viaenv* at pci? dev ? function ? +# VIA VT82C686A hardware monitor +#viapm* at pci? dev ? function ? +#viaenv* at viapm? # I2O devices @@ -640,7 +635,6 @@ bha* at pci? dev ? function ? # BusLogic dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel -mfi* at pci? dev ? function ? # LSI MegaRAID SAS mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC njs* at pci? dev ? function ? # Workbit NinjaSCSI-32 @@ -735,7 +729,6 @@ icpsp* at icp? unit ? # SCSI pass-thro pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers -ahcisata* at pci? dev ? function ? # AHCI SATA controllers artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers @@ -762,7 +755,7 @@ wdc* at isapnp? wdc* at pcmcia? function ? # CardBus IDE controllers -#njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32 +#njata* at cardbus? function ? flags 0 # Workbit NinjaATA-32 # ISA ST506, ESDI, and IDE controllers # Use flags 0x01 if you want to try to use 32bits data I/O (the driver will @@ -833,7 +826,6 @@ ath* at pci? dev ? function ? # Atheros atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet -bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR en* at pci? dev ? function ? # ENI/Adaptec ATM ep* at pci? dev ? function ? # 3Com 3c59x @@ -859,7 +851,6 @@ pcn* at pci? dev ? function ? # AMD PCne ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at pci? dev ? function ? # Realtek 8129/8139 -rtw* at pci? dev ? function ? # Realtek 8180L (802.11) sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet @@ -972,7 +963,6 @@ glxtphy* at mii? phy ? # Level One LXT gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 -ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs lxtphy* at mii? phy ? # Level One LXT-970 PHYs @@ -1074,7 +1064,6 @@ url* at uhub? port ? # Realtek RTL8150L # USB 802.11 adapters atu* at uhub? port ? # Atmel AT76C50XX based adapters ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g -rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g # Prolific PL2301/PL2302 host-to-host adapter upl* at uhub? port ? @@ -1128,7 +1117,7 @@ radio* at udsbr? # USB Generic driver ugen* at uhub? port ? # On ugen bulk endpoints, perform read-ahead and write-behind. -options UGEN_BULK_RA_WB +options UGEN_BULK_RA_WB # IrDA and Consumer Ir devices @@ -1264,12 +1253,11 @@ bt3c* at pcmcia? function ? # 3Com 3CRW # Bluetooth USB Controllers ubt* at uhub? port ? configuration ? interface ? -# Bluetooth Device Hub -bthub* at bt3c? -bthub* at ubt? +# Bluetooth Devices +pseudo-device btdev 4 # Bluetooth HID support -bthidev* at bthub? +bthidev* at btdev? # Bluetooth Mouse btms* at bthidev? reportid ? @@ -1280,7 +1268,7 @@ btkbd* at bthidev? reportid ? wskbd* at btkbd? console ? mux 1 # Bluetooth Audio support -btsco* at bthub? +btsco* at btdev? # Mice @@ -1378,8 +1366,6 @@ pseudo-device bridge # simple inter-ne #options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if -# srt is EXPERIMENTAL -#pseudo-device srt # source-address-based routing # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals @@ -1389,7 +1375,6 @@ pseudo-device rnd # /dev/random and in #options RND_COM # use "com" randomness as well (BROKEN) pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms -pseudo-device lockstat # lock profiling # a pseudo device needed for Coda # also needs CODA (above) pseudo-device vcoda 4 # coda minicache <-> venus comm. @@ -1401,21 +1386,19 @@ pseudo-device nsmb # experimental - SM pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont -options FILEASSOC # fileassoc(9) - required for Veriexec -#options FILEASSOC_NHOOKS=4 # Default number of storage slots +#options FILEASSOC # fileassoc(9) - required for Veriexec +#options FILEASSOC_NHOOKS=4 # Default number of storage slots # Veriexec -pseudo-device veriexec +#pseudo-device veriexec # # Uncomment the fingerprint methods below that are desired. Note that # removing fingerprint methods will have almost no impact on the kernel # code size. # -options VERIFIED_EXEC_FP_RMD160 -options VERIFIED_EXEC_FP_SHA256 -options VERIFIED_EXEC_FP_SHA384 -options VERIFIED_EXEC_FP_SHA512 -options VERIFIED_EXEC_FP_SHA1 -options VERIFIED_EXEC_FP_MD5 - -options PAX_MPROTECT=0 # PaX mprotect(2) restrictions +#options VERIFIED_EXEC_FP_RMD160 +#options VERIFIED_EXEC_FP_SHA256 +#options VERIFIED_EXEC_FP_SHA384 +#options VERIFIED_EXEC_FP_SHA512 +#options VERIFIED_EXEC_FP_SHA1 +#options VERIFIED_EXEC_FP_MD5