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.781.2.1 retrieving revision 1.781.2.2 diff -u -p -r1.781.2.1 -r1.781.2.2 --- src/sys/arch/i386/conf/GENERIC 2006/10/22 06:04:43 1.781.2.1 +++ src/sys/arch/i386/conf/GENERIC 2006/12/10 07:16:02 1.781.2.2 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.781.2.1 2006/10/22 06:04:43 yamt Exp $ +# $NetBSD: GENERIC,v 1.781.2.2 2006/12/10 07:16:02 yamt Exp $ # # GENERIC machine description file # @@ -22,18 +22,21 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.781.2.1 $" +#ident "GENERIC-$Revision: 1.781.2.2 $" 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 @@ -54,7 +57,6 @@ options MTRR # memory-type range regis #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 @@ -173,7 +175,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 # experimental - Efficient memory file-system +file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system # File system options @@ -270,7 +272,7 @@ options WSDISPLAY_COMPAT_RAWKBD # can 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 @@ -733,6 +735,7 @@ 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 @@ -855,6 +858,7 @@ 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 @@ -970,7 +974,6 @@ igphy* at mii? phy ? # Intel IGP01E100 ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs -ikphy* at mii? phy ? # Intel 82563 PHYs lxtphy* at mii? phy ? # Level One LXT-970 PHYs makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs nsphy* at mii? phy ? # NS83840 PHYs @@ -1070,6 +1073,7 @@ 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 ? @@ -1123,7 +1127,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 @@ -1393,21 +1397,21 @@ 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 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