Sun Sep 23 01:03:40 2012 UTC ()
add some more devices and options.


(chs)
diff -r1.343 -r1.344 src/sys/arch/i386/conf/ALL
cvs diff -r1.343 -r1.344 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2012/09/01 18:17:50 1.343
+++ src/sys/arch/i386/conf/ALL 2012/09/23 01:03:39 1.344
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.343 2012/09/01 18:17:50 jakllsch Exp $ 1# $NetBSD: ALL,v 1.344 2012/09/23 01:03:39 chs Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/i386/conf/std.i386" 16include "arch/i386/conf/std.i386"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.343 $" 20#ident "ALL-$Revision: 1.344 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27options VM86 # virtual 8086 emulation 27options VM86 # virtual 8086 emulation
28options USER_LDT # user-settable LDT; used by WINE 28options USER_LDT # user-settable LDT; used by WINE
29options X86EMU # 386 Real Mode emulator 29options X86EMU # 386 Real Mode emulator
30options PAE # PAE mode (36 bits physical addressing) 30options PAE # PAE mode (36 bits physical addressing)
31 31
32# CPU features 32# CPU features
33acpicpu* at cpu? # ACPI CPU (including frequency scaling) 33acpicpu* at cpu? # ACPI CPU (including frequency scaling)
@@ -115,26 +115,27 @@ options LOCKDEBUG # expensive locking c @@ -115,26 +115,27 @@ options LOCKDEBUG # expensive locking c
115options KMEMSTATS # kernel memory statistics (vmstat -m) 115options KMEMSTATS # kernel memory statistics (vmstat -m)
116options DDB # in-kernel debugger 116options DDB # in-kernel debugger
117options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic' 117options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
118options DDB_HISTORY_SIZE=512 # enable history editing in DDB 118options DDB_HISTORY_SIZE=512 # enable history editing in DDB
119options DDB_VERBOSE_HELP 119options DDB_VERBOSE_HELP
120options KGDB # remote debugger 120options KGDB # remote debugger
121options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 121options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
122options IPKDB # IP Kernel Debugger 122options IPKDB # IP Kernel Debugger
123options IPKDBKEY="\"Pass_phrase_to_debug_over_network\"" 123options IPKDBKEY="\"Pass_phrase_to_debug_over_network\""
124makeoptions DEBUG="-g" # compile full symbol table 124makeoptions DEBUG="-g" # compile full symbol table
125options SYSCALL_STATS # per syscall counts 125options SYSCALL_STATS # per syscall counts
126options SYSCALL_TIMES # per syscall times 126options SYSCALL_TIMES # per syscall times
127options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) 127options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
 128options KDTRACE_HOOKS # kernel DTrace hooks
128 129
129# Compatibility options 130# Compatibility options
130options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI 131options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
131options COMPAT_09 # NetBSD 0.9 132options COMPAT_09 # NetBSD 0.9
132options COMPAT_10 # NetBSD 1.0 133options COMPAT_10 # NetBSD 1.0
133options COMPAT_11 # NetBSD 1.1 134options COMPAT_11 # NetBSD 1.1
134options COMPAT_12 # NetBSD 1.2, 386BSD, and BSDI 135options COMPAT_12 # NetBSD 1.2, 386BSD, and BSDI
135options COMPAT_13 # NetBSD 1.3, 386BSD, and BSDI 136options COMPAT_13 # NetBSD 1.3, 386BSD, and BSDI
136options COMPAT_14 # NetBSD 1.4 137options COMPAT_14 # NetBSD 1.4
137options COMPAT_15 # NetBSD 1.5 138options COMPAT_15 # NetBSD 1.5
138options COMPAT_16 # NetBSD 1.6 139options COMPAT_16 # NetBSD 1.6
139options COMPAT_20 # NetBSD 2.0 140options COMPAT_20 # NetBSD 2.0
140options COMPAT_30 # NetBSD 3.0 141options COMPAT_30 # NetBSD 3.0
@@ -563,27 +564,28 @@ options PMS_ELANTECH_TOUCHPAD # Enable  @@ -563,27 +564,28 @@ options PMS_ELANTECH_TOUCHPAD # Enable
563vga0 at isa? 564vga0 at isa?
564vga* at pci? dev ? function ? 565vga* at pci? dev ? function ?
565pcdisplay0 at isa? # CGA, MDA, EGA, HGA 566pcdisplay0 at isa? # CGA, MDA, EGA, HGA
566wskbd* at pckbd? console ? 567wskbd* at pckbd? console ?
567wsmouse* at pms? mux 0 568wsmouse* at pms? mux 0
568 569
569chipsfb* at pci? dev ? function ? 570chipsfb* at pci? dev ? function ?
570genfb* at pci? dev ? function ? 571genfb* at pci? dev ? function ?
571igsfb* at pci? dev ? function ? 572igsfb* at pci? dev ? function ?
572machfb* at pci? dev ? function ? 573machfb* at pci? dev ? function ?
573pm2fb* at pci? dev ? function ? 574pm2fb* at pci? dev ? function ?
574r128fb* at pci? dev ? function ? 575r128fb* at pci? dev ? function ?
575radeonfb* at pci? dev ? function ? 576radeonfb* at pci? dev ? function ?
576unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console 577tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics
 578unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console
577voodoofb* at pci? dev ? function ? 579voodoofb* at pci? dev ? function ?
578wcfb* at pci? dev ? function ? 580wcfb* at pci? dev ? function ?
579wsdisplay* at wsemuldisplaydev? 581wsdisplay* at wsemuldisplaydev?
580 582
581# DRI driver 583# DRI driver
582i915drm* at drm? # Intel i915, i945 DRM driver 584i915drm* at drm? # Intel i915, i945 DRM driver
583mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver 585mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
584mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver 586mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
585r128drm* at drm? # ATI Rage 128 DRM driver 587r128drm* at drm? # ATI Rage 128 DRM driver
586radeondrm* at drm? # ATI Radeon DRM driver 588radeondrm* at drm? # ATI Radeon DRM driver
587savagedrm* at drm? # S3 Savage DRM driver 589savagedrm* at drm? # S3 Savage DRM driver
588sisdrm* at drm? # SiS DRM driver 590sisdrm* at drm? # SiS DRM driver
589tdfxdrm* at drm? # 3dfx (voodoo) DRM driver 591tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
@@ -993,26 +995,27 @@ bce* at pci? dev ? function ? # Broadcom @@ -993,26 +995,27 @@ bce* at pci? dev ? function ? # Broadcom
993bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet 995bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
994bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet 996bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
995bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless 997bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless
996cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet 998cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet
997dge* at pci? dev ? function ? # Intel 82597 10GbE LR 999dge* at pci? dev ? function ? # Intel 82597 10GbE LR
998en* at pci? dev ? function ? # ENI/Adaptec ATM 1000en* at pci? dev ? function ? # ENI/Adaptec ATM
999ep* at pci? dev ? function ? # 3Com 3c59x 1001ep* at pci? dev ? function ? # 3Com 3c59x
1000epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet 1002epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
1001esh* at pci? dev ? function ? # Essential HIPPI card 1003esh* at pci? dev ? function ? # Essential HIPPI card
1002et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit 1004et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
1003ex* at pci? dev ? function ? # 3Com 3c90x[BC] 1005ex* at pci? dev ? function ? # 3Com 3c90x[BC]
1004fpa* at pci? dev ? function ? # DEC DEFPA FDDI 1006fpa* at pci? dev ? function ? # DEC DEFPA FDDI
1005fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B 1007fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
 1008gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet
1006gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet 1009gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
1007hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ 1010hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
1008ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 1011ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100
1009iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG 1012iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
1010iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN 1013iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
1011jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet 1014jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet
1012le* at pci? dev ? function ? # PCnet-PCI Ethernet 1015le* at pci? dev ? function ? # PCnet-PCI Ethernet
1013lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet 1016lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
1014lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 1017lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
1015malo* at pci? dev ? function ? # Marvell Libertas Wireless 1018malo* at pci? dev ? function ? # Marvell Libertas Wireless
1016mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet 1019mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
1017msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet 1020msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
1018mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet 1021mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
@@ -1647,54 +1650,52 @@ options RF_INCLUDE_INTERDECLUSTER=1 @@ -1647,54 +1650,52 @@ options RF_INCLUDE_INTERDECLUSTER=1
1647options RF_INCLUDE_PARITY_DECLUSTERING=1 1650options RF_INCLUDE_PARITY_DECLUSTERING=1
1648options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 1651options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
1649pseudo-device fss # file system snapshot device 1652pseudo-device fss # file system snapshot device
1650 1653
1651pseudo-device md # memory disk device (ramdisk) 1654pseudo-device md # memory disk device (ramdisk)
1652options MEMORY_DISK_HOOKS # enable root ramdisk 1655options MEMORY_DISK_HOOKS # enable root ramdisk
1653options MEMORY_DISK_DYNAMIC # loaded via kernel module(7) 1656options MEMORY_DISK_DYNAMIC # loaded via kernel module(7)
1654 1657
1655pseudo-device vnd # disk-like interface to files 1658pseudo-device vnd # disk-like interface to files
1656options VND_COMPRESSION # compressed vnd(4) 1659options VND_COMPRESSION # compressed vnd(4)
1657 1660
1658pseudo-device dm # device-mapper disk driver 1661pseudo-device dm # device-mapper disk driver
1659 1662
1660# NPF 
1661pseudo-device npf 
1662 
1663# network pseudo-devices 1663# network pseudo-devices
1664pseudo-device bpfilter # Berkeley packet filter 1664pseudo-device bpfilter # Berkeley packet filter
1665pseudo-device carp # Common Address Redundancy Protocol 1665pseudo-device carp # Common Address Redundancy Protocol
1666pseudo-device ipfilter # IP filter (firewall) and NAT 1666pseudo-device ipfilter # IP filter (firewall) and NAT
1667pseudo-device ifmpls # MPLS pseudo-interface 1667pseudo-device ifmpls # MPLS pseudo-interface
1668pseudo-device loop # network loopback 1668pseudo-device loop # network loopback
1669pseudo-device ppp # Point-to-Point Protocol 1669pseudo-device ppp # Point-to-Point Protocol
1670pseudo-device pppoe # PPP over Ethernet (RFC 2516) 1670pseudo-device pppoe # PPP over Ethernet (RFC 2516)
1671options PPPOE_SERVER # Enable PPPoE server via link0 1671options PPPOE_SERVER # Enable PPPoE server via link0
1672pseudo-device sl # Serial Line IP 1672pseudo-device sl # Serial Line IP
1673pseudo-device strip # Starmode Radio IP (Metricom) 1673pseudo-device strip # Starmode Radio IP (Metricom)
1674pseudo-device irframetty # IrDA frame line discipline 1674pseudo-device irframetty # IrDA frame line discipline
1675pseudo-device tap # virtual Ethernet 1675pseudo-device tap # virtual Ethernet
1676pseudo-device tun # network tunneling over tty 1676pseudo-device tun # network tunneling over tty
1677pseudo-device gre # generic L3 over IP tunnel 1677pseudo-device gre # generic L3 over IP tunnel
1678pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933) 1678pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
1679pseudo-device faith # IPv[46] tcp relay translation i/f 1679pseudo-device faith # IPv[46] tcp relay translation i/f
1680pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation 1680pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
1681pseudo-device vlan # IEEE 802.1q encapsulation 1681pseudo-device vlan # IEEE 802.1q encapsulation
1682pseudo-device bridge # simple inter-network bridging 1682pseudo-device bridge # simple inter-network bridging
1683options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too 1683options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
1684pseudo-device agr # IEEE 802.3ad link aggregation 1684pseudo-device agr # IEEE 802.3ad link aggregation
1685pseudo-device pf # PF packet filter 1685pseudo-device pf # PF packet filter
1686pseudo-device pflog # PF log if 1686pseudo-device pflog # PF log if
1687pseudo-device pfsync 1687pseudo-device pfsync # PF sync if
 1688pseudo-device npf # NPF packet filter
1688pseudo-device kttcp 1689pseudo-device kttcp
1689pseudo-device etherip # EtherIP 1690pseudo-device etherip # EtherIP
1690# srt is EXPERIMENTAL 1691# srt is EXPERIMENTAL
1691pseudo-device srt # source-address-based routing 1692pseudo-device srt # source-address-based routing
1692 1693
1693# 1694#
1694# accept filters, built as module(7)s by default 1695# accept filters, built as module(7)s by default
1695pseudo-device accf_data # "dataready" accept filter 1696pseudo-device accf_data # "dataready" accept filter
1696pseudo-device accf_http # "httpready" accept filter 1697pseudo-device accf_http # "httpready" accept filter
1697 1698
1698# miscellaneous pseudo-devices 1699# miscellaneous pseudo-devices
1699pseudo-device pty # pseudo-terminals 1700pseudo-device pty # pseudo-terminals
1700pseudo-device sequencer 1 # MIDI sequencer 1701pseudo-device sequencer 1 # MIDI sequencer