Sat Nov 21 12:15:55 2009 UTC ()
- more options<space><tab>
- capitalize Ethenet


(tsutsui)
diff -r1.951 -r1.952 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.951 -r1.952 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2009/11/21 12:09:15 1.951
+++ src/sys/arch/i386/conf/GENERIC 2009/11/21 12:15:55 1.952
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.951 2009/11/21 12:09:15 tsutsui Exp $ 1# $NetBSD: GENERIC,v 1.952 2009/11/21 12:15:55 tsutsui Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.951 $" 25#ident "GENERIC-$Revision: 1.952 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# For GENERIC, we build the exec formats as modules by default. 29# For GENERIC, we build the exec formats as modules by default.
30no options EXEC_AOUT # exec a.out binaries 30no options EXEC_AOUT # exec a.out binaries
31no options EXEC_ELF32 # exec ELF binaries 31no options EXEC_ELF32 # exec ELF binaries
32no options EXEC_SCRIPT # exec #! scripts 32no options EXEC_SCRIPT # exec #! scripts
33no options COREDUMP 33no options COREDUMP
34 34
35# CPU-related options. 35# CPU-related options.
36options VM86 # virtual 8086 emulation 36options VM86 # virtual 8086 emulation
37options USER_LDT # user-settable LDT; used by WINE 37options USER_LDT # user-settable LDT; used by WINE
38 38
@@ -914,27 +914,27 @@ bnx* at pci? dev ? function ? # Broadco @@ -914,27 +914,27 @@ bnx* at pci? dev ? function ? # Broadco
914dge* at pci? dev ? function ? # Intel 82597 10GbE LR 914dge* at pci? dev ? function ? # Intel 82597 10GbE LR
915en* at pci? dev ? function ? # ENI/Adaptec ATM 915en* at pci? dev ? function ? # ENI/Adaptec ATM
916ep* at pci? dev ? function ? # 3Com 3c59x 916ep* at pci? dev ? function ? # 3Com 3c59x
917epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet 917epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
918esh* at pci? dev ? function ? # Essential HIPPI card 918esh* at pci? dev ? function ? # Essential HIPPI card
919ex* at pci? dev ? function ? # 3Com 90x[BC] 919ex* at pci? dev ? function ? # 3Com 90x[BC]
920fpa* at pci? dev ? function ? # DEC DEFPA FDDI 920fpa* at pci? dev ? function ? # DEC DEFPA FDDI
921fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B 921fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
922gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet 922gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
923hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ 923hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
924ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 924ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100
925iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG 925iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
926iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN 926iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
927jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet 927jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet
928le* at pci? dev ? function ? # PCnet-PCI Ethernet 928le* at pci? dev ? function ? # PCnet-PCI Ethernet
929lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet 929lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
930lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 930lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
931mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet 931mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
932msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet 932msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
933mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet 933mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
934#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver 934#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver
935ne* at pci? dev ? function ? # NE2000-compatible Ethernet 935ne* at pci? dev ? function ? # NE2000-compatible Ethernet
936nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet 936nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet
937ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial 937ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
938pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet 938pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet
939ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g 939ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g
940re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S 940re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
@@ -984,43 +984,43 @@ sm* at pcmcia? function ? # Megahertz E @@ -984,43 +984,43 @@ sm* at pcmcia? function ? # Megahertz E
984#tr* at pcmcia? function ? # TROPIC based Token-Ring 984#tr* at pcmcia? function ? # TROPIC based Token-Ring
985wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11) 985wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
986xirc* at pcmcia? function ? # Xircom CreditCard Ethernet 986xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
987com* at xirc? 987com* at xirc?
988xi* at xirc? 988xi* at xirc?
989mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards 989mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
990com* at mhzc? 990com* at mhzc?
991sm* at mhzc? 991sm* at mhzc?
992 992
993# ISA network interfaces 993# ISA network interfaces
994ate0 at isa? port 0x2a0 irq ? # AT1700 994ate0 at isa? port 0x2a0 irq ? # AT1700
995cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet 995cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
996ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet 996ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
997eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards 997eg0 at isa? port 0x280 irq 9 # 3C505 Ethernet cards
998el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards 998el0 at isa? port 0x300 irq 9 # 3C501 Ethernet cards
999ep* at isa? port ? irq ? # 3C509 ethernet cards 999ep* at isa? port ? irq ? # 3C509 Ethernet cards
1000ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507 1000ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
1001ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN 1001ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
1002fmv0 at isa? port 0x2a0 irq ? # FMV-181/182 1002fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
1003ix0 at isa? port 0x300 irq 10 # EtherExpress/16 1003ix0 at isa? port 0x300 irq 10 # EtherExpress/16
1004iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA 1004iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
1005lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC) 1005lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
1006#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA 1006#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
1007#le* at depca? 1007#le* at depca?
1008nele0 at isa? port 0x320 irq 9 drq 7 # NE2100 1008nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
1009le* at nele? 1009le* at nele?
1010#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial 1010#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
1011bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan 1011bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
1012le* at bicc? 1012le* at bicc?
1013ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards 1013ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
1014ne1 at isa? port 0x300 irq 10 1014ne1 at isa? port 0x300 irq 10
1015sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet 1015sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
1016tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring 1016tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
1017tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring 1017tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
1018tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring 1018tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
1019we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet 1019we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
1020we1 at isa? port 0x300 iomem 0xcc000 irq 10 1020we1 at isa? port 0x300 iomem 0xcc000 irq 10
1021 1021
1022# CardBus network cards 1022# CardBus network cards
1023ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 1023ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
1024atw* at cardbus? function ? # ADMtek ADM8211 (802.11) 1024atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
1025ex* at cardbus? function ? # 3Com 3C575TX 1025ex* at cardbus? function ? # 3Com 3C575TX
1026fxp* at cardbus? function ? # Intel i8255x 1026fxp* at cardbus? function ? # Intel i8255x
@@ -1222,27 +1222,27 @@ usscanner* at uhub? port ? @@ -1222,27 +1222,27 @@ usscanner* at uhub? port ?
1222# Topfield TF5000PVR range of DVB recorders 1222# Topfield TF5000PVR range of DVB recorders
1223utoppy* at uhub? port ? 1223utoppy* at uhub? port ?
1224 1224
1225# Y@P firmware loader 1225# Y@P firmware loader
1226uyap* at uhub? port ? 1226uyap* at uhub? port ?
1227 1227
1228# D-Link DSB-R100 USB radio 1228# D-Link DSB-R100 USB radio
1229udsbr* at uhub? port ? 1229udsbr* at uhub? port ?
1230radio* at udsbr? 1230radio* at udsbr?
1231 1231
1232# USB Generic driver 1232# USB Generic driver
1233ugen* at uhub? port ? 1233ugen* at uhub? port ?
1234# On ugen bulk endpoints, perform read-ahead and write-behind. 1234# On ugen bulk endpoints, perform read-ahead and write-behind.
1235options UGEN_BULK_RA_WB 1235options UGEN_BULK_RA_WB
1236 1236
1237# USB 3G datacards 1237# USB 3G datacards
1238u3g* at uhub? port ? 1238u3g* at uhub? port ?
1239ucom* at u3g? 1239ucom* at u3g?
1240 1240
1241# USB generic serial port (e.g., data over cellular) 1241# USB generic serial port (e.g., data over cellular)
1242ugensa* at uhub? port ? 1242ugensa* at uhub? port ?
1243ucom* at ugensa? 1243ucom* at ugensa?
1244 1244
1245# IrDA and Consumer Ir devices 1245# IrDA and Consumer Ir devices
1246 1246
1247# Toshiba Oboe 1247# Toshiba Oboe
1248oboe* at pci? dev ? function ? 1248oboe* at pci? dev ? function ?
@@ -1558,22 +1558,22 @@ pseudo-device pad @@ -1558,22 +1558,22 @@ pseudo-device pad
1558 1558
1559# userland interface to drivers, including autoconf and properties retrieval 1559# userland interface to drivers, including autoconf and properties retrieval
1560pseudo-device drvctl 1560pseudo-device drvctl
1561 1561
1562options FILEASSOC # fileassoc(9) - required for Veriexec 1562options FILEASSOC # fileassoc(9) - required for Veriexec
1563 1563
1564# Veriexec 1564# Veriexec
1565pseudo-device veriexec 1565pseudo-device veriexec
1566# 1566#
1567# Uncomment the fingerprint methods below that are desired. Note that 1567# Uncomment the fingerprint methods below that are desired. Note that
1568# removing fingerprint methods will have almost no impact on the kernel 1568# removing fingerprint methods will have almost no impact on the kernel
1569# code size. 1569# code size.
1570# 1570#
1571options VERIFIED_EXEC_FP_RMD160 1571options VERIFIED_EXEC_FP_RMD160
1572options VERIFIED_EXEC_FP_SHA256 1572options VERIFIED_EXEC_FP_SHA256
1573options VERIFIED_EXEC_FP_SHA384 1573options VERIFIED_EXEC_FP_SHA384
1574options VERIFIED_EXEC_FP_SHA512 1574options VERIFIED_EXEC_FP_SHA512
1575options VERIFIED_EXEC_FP_SHA1 1575options VERIFIED_EXEC_FP_SHA1
1576options VERIFIED_EXEC_FP_MD5 1576options VERIFIED_EXEC_FP_MD5
1577 1577
1578options PAX_MPROTECT=0 # PaX mprotect(2) restrictions 1578options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
1579options PAX_ASLR=0 # PaX Address Space Layout Randomization 1579options PAX_ASLR=0 # PaX Address Space Layout Randomization