Sat Aug 7 19:18:04 2010 UTC ()
Removed double WAPBL option. Fixed typo.


(phx)
diff -r1.49 -r1.50 src/sys/arch/sandpoint/conf/GENERIC
cvs diff -r1.49 -r1.50 src/sys/arch/sandpoint/conf/GENERIC (switch to unified diff)

--- src/sys/arch/sandpoint/conf/GENERIC 2010/06/30 17:49:32 1.49
+++ src/sys/arch/sandpoint/conf/GENERIC 2010/08/07 19:18:04 1.50
@@ -1,228 +1,226 @@ @@ -1,228 +1,226 @@
1# $NetBSD: GENERIC,v 1.49 2010/06/30 17:49:32 phx Exp $ 1# $NetBSD: GENERIC,v 1.50 2010/08/07 19:18:04 phx Exp $
2# 2#
3# machine description file for GENERIC NAS 3# machine description file for GENERIC NAS
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/sandpoint/conf/std.sandpoint" 21include "arch/sandpoint/conf/std.sandpoint"
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.49 $" 25#ident "GENERIC-$Revision: 1.50 $"
26 26
27maxusers 32 27maxusers 32
28 28
29#options ALTIVEC # Include AltiVec support 29#options ALTIVEC # Include AltiVec support
30 30
31#options IPKDBUSERHACK # Allow access to mapped memory via kgdb 31#options IPKDBUSERHACK # Allow access to mapped memory via kgdb
32#options DEBUG_BY_TOOLS # Allow debugging from toolsnet 32#options DEBUG_BY_TOOLS # Allow debugging from toolsnet
33# HMAC key to be used for debugging sessions 33# HMAC key to be used for debugging sessions
34#options IPKDBKEY="\"HMAC pass phrase text\"" 34#options IPKDBKEY="\"HMAC pass phrase text\""
35#options IPKDBSECURE # Allow debugging even when securelevel > 0 35#options IPKDBSECURE # Allow debugging even when securelevel > 0
36#makeoptions DEBUG="-g" 36#makeoptions DEBUG="-g"
37 37
38#options DEBUG 38#options DEBUG
39options DIAGNOSTIC 39options DIAGNOSTIC
40options TRAP_PANICWAIT 40options TRAP_PANICWAIT
41options DDB 41options DDB
42#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 42#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
43options KTRACE 43options KTRACE
44#options PMAPCHECK 44#options PMAPCHECK
45#options PMAPDEBUG 45#options PMAPDEBUG
46#options SYMTAB_SPACE=300000 46#options SYMTAB_SPACE=300000
47#options USERCONF # userconf(4) support 47#options USERCONF # userconf(4) support
48#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 48#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
49options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 49options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
50 50
51# Compatibility options 51# Compatibility options
52options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI 52options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
53options COMPAT_09 # NetBSD 0.9 53options COMPAT_09 # NetBSD 0.9
54options COMPAT_10 # NetBSD 1.0 54options COMPAT_10 # NetBSD 1.0
55options COMPAT_11 # NetBSD 1.1 55options COMPAT_11 # NetBSD 1.1
56options COMPAT_12 # NetBSD 1.2, 386BSD, and BSDI 56options COMPAT_12 # NetBSD 1.2, 386BSD, and BSDI
57options COMPAT_13 # NetBSD 1.3, 386BSD, and BSDI 57options COMPAT_13 # NetBSD 1.3, 386BSD, and BSDI
58options COMPAT_14 # NetBSD 1.4 58options COMPAT_14 # NetBSD 1.4
59options COMPAT_15 # NetBSD 1.5 59options COMPAT_15 # NetBSD 1.5
60options COMPAT_16 # NetBSD 1.6 60options COMPAT_16 # NetBSD 1.6
61options COMPAT_20 # NetBSD 2.0 61options COMPAT_20 # NetBSD 2.0
62options COMPAT_30 # NetBSD 3.0 62options COMPAT_30 # NetBSD 3.0
63options COMPAT_40 # NetBSD 4.0 63options COMPAT_40 # NetBSD 4.0
64options COMPAT_50 # NetBSD 5.0 compatibility. 64options COMPAT_50 # NetBSD 5.0 compatibility.
65options COMPAT_43 # 4.3BSD, 386BSD, and BSDI 65options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
66#options COMPAT_386BSD_MBRPART # recognize old partition ID 66#options COMPAT_386BSD_MBRPART # recognize old partition ID
67#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 67#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
68 68
69options COMPAT_LINUX # binary compatibility with Linux 69options COMPAT_LINUX # binary compatibility with Linux
70options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 70options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
71 71
72options MSGBUFSIZE=65536 72options MSGBUFSIZE=65536
73 73
74#options WAPBL 
75 
76file-system FFS # UFS 74file-system FFS # UFS
77file-system EXT2FS # second extended file system (linux) 75file-system EXT2FS # second extended file system (linux)
78#file-system LFS # log-structured file system 76#file-system LFS # log-structured file system
79file-system MFS # memory file system 77file-system MFS # memory file system
80file-system NFS # Network File System client 78file-system NFS # Network File System client
81#file-system NTFS # Windows/NT file system (experimental) 79#file-system NTFS # Windows/NT file system (experimental)
82#file-system CD9660 # ISO 9660 + Rock Ridge file system 80#file-system CD9660 # ISO 9660 + Rock Ridge file system
83file-system MSDOSFS # MS-DOS file system 81file-system MSDOSFS # MS-DOS file system
84file-system FDESC # /dev/fd 82file-system FDESC # /dev/fd
85file-system KERNFS # /kern 83file-system KERNFS # /kern
86file-system NULLFS # loopback file system 84file-system NULLFS # loopback file system
87#file-system OVERLAY # overlay file system 85#file-system OVERLAY # overlay file system
88file-system PROCFS # /proc 86file-system PROCFS # /proc
89#file-system UMAPFS # NULLFS + uid and gid remapping 87#file-system UMAPFS # NULLFS + uid and gid remapping
90#file-system UNION # union file system 88#file-system UNION # union file system
91#file-system CODA # Coda File System; also needs vcoda (below) 89#file-system CODA # Coda File System; also needs vcoda (below)
92#file-system SMBFS # experimental - CIFS; also needs nsmb (below) 90#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
93file-system PTYFS # /dev/ptm support 91file-system PTYFS # /dev/ptm support
94file-system TMPFS # Efficient memory file-system 92file-system TMPFS # Efficient memory file-system
95 93
96# File system options 94# File system options
97options QUOTA # UFS quotas 95options QUOTA # UFS quotas
98#options FFS_EI # FFS Endian Independent support 96#options FFS_EI # FFS Endian Independent support
99options WAPBL # File system journaling support - Experimental 97options WAPBL # File system journaling support - Experimental
100options NFSSERVER # Network File System server 98options NFSSERVER # Network File System server
101#options FFS_NO_SNAPSHOT # No FFS snapshot support 99#options FFS_NO_SNAPSHOT # No FFS snapshot support
102#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 100#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
103 101
104options INET 102options INET
105options INET6 # IPV6 103options INET6 # IPV6
106#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 104#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
107 105
108#options ALTQ # Manipulate network interfaces' output queues 106#options ALTQ # Manipulate network interfaces' output queues
109#options ALTQ_BLUE # Stochastic Fair Blue 107#options ALTQ_BLUE # Stochastic Fair Blue
110#options ALTQ_CBQ # Class-Based Queueing 108#options ALTQ_CBQ # Class-Based Queueing
111#options ALTQ_CDNR # Diffserv Traffic Conditioner 109#options ALTQ_CDNR # Diffserv Traffic Conditioner
112#options ALTQ_FIFOQ # First-In First-Out Queue 110#options ALTQ_FIFOQ # First-In First-Out Queue
113#options ALTQ_FLOWVALVE # RED/flow-valve (red-penalty-box) 111#options ALTQ_FLOWVALVE # RED/flow-valve (red-penalty-box)
114#options ALTQ_HFSC # Hierarchical Fair Service Curve 112#options ALTQ_HFSC # Hierarchical Fair Service Curve
115#options ALTQ_LOCALQ # Local queueing discipline 113#options ALTQ_LOCALQ # Local queueing discipline
116#options ALTQ_PRIQ # Priority Queueing 114#options ALTQ_PRIQ # Priority Queueing
117#options ALTQ_RED # Random Early Detection 115#options ALTQ_RED # Random Early Detection
118#options ALTQ_RIO # RED with IN/OUT 116#options ALTQ_RIO # RED with IN/OUT
119#options ALTQ_WFQ # Weighted Fair Queueing 117#options ALTQ_WFQ # Weighted Fair Queueing
120 118
121options NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTP 119options NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTP
122 120
123config netbsd root on ? type ? 121config netbsd root on ? type ?
124 122
125# network psuedo-devices 123# network pseudo-devices
126pseudo-device bpfilter # packet filter 124pseudo-device bpfilter # packet filter
127pseudo-device vlan # IEEE 802.1q encapsulation 125pseudo-device vlan # IEEE 802.1q encapsulation
128#pseudo-device pppoe # PPP over Ethernet (RFC 2516) 126#pseudo-device pppoe # PPP over Ethernet (RFC 2516)
129#pseudo-device bridge # simple inter-network bridging 127#pseudo-device bridge # simple inter-network bridging
130#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too 128#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
131#pseudo-device ipfilter 129#pseudo-device ipfilter
132pseudo-device loop 130pseudo-device loop
133 131
134# miscellaneous pseudo-devices 132# miscellaneous pseudo-devices
135pseudo-device rnd # /dev/random and in-kernel generator 133pseudo-device rnd # /dev/random and in-kernel generator
136pseudo-device vnd  134pseudo-device vnd
137#options VND_COMPRESSION # compressed vnd(4) 135#options VND_COMPRESSION # compressed vnd(4)
138#pseudo-device cgd 4 # cryptographic disk devices 136#pseudo-device cgd 4 # cryptographic disk devices
139pseudo-device pty 137pseudo-device pty
140pseudo-device clockctl # user control of clock subsystem 138pseudo-device clockctl # user control of clock subsystem
141pseudo-device ksyms # /dev/ksyms 139pseudo-device ksyms # /dev/ksyms
142#pseudo-device pf # PF packet filter 140#pseudo-device pf # PF packet filter
143#pseudo-device pflog # PF log if 141#pseudo-device pflog # PF log if
144pseudo-device fss # file system snapshot device 142pseudo-device fss # file system snapshot device
145 143
146# 144#
147# device 145# device
148# 146#
149options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 147options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
150 148
151#options PCIVERBOSE # verbose PCI device messages 149#options PCIVERBOSE # verbose PCI device messages
152#options PCI_CONFIG_DUMP # verbosely dump PCI config space 150#options PCI_CONFIG_DUMP # verbosely dump PCI config space
153#options PCI_NETBSD_CONFIGURE # Have NetBSD configure PCI I/O & Mem 151#options PCI_NETBSD_CONFIGURE # Have NetBSD configure PCI I/O & Mem
154 152
155mainbus0 at root 153mainbus0 at root
156 154
157cpu* at mainbus0 155cpu* at mainbus0
158pci* at mainbus0 bus ? 156pci* at mainbus0 bus ?
159 157
160pchb* at pci? dev ? function ? # PCI host bridge 158pchb* at pci? dev ? function ? # PCI host bridge
161 159
162eumb* at mainbus0 160eumb* at mainbus0
163com0 at eumb? unit 0 # console at 0x4500 161com0 at eumb? unit 0 # console at 0x4500
164#com1 at eumb? unit 1 162#com1 at eumb? unit 1
165satmgr0 at eumb? unit 1 # satmgr at 0x4600 163satmgr0 at eumb? unit 1 # satmgr at 0x4600
166ociic* at eumb? 164ociic* at eumb?
167iic* at ociic? 165iic* at ociic?
168rs5c372rtc* at iic? addr 0x32 166rs5c372rtc* at iic? addr 0x32
169 167
170# PCI IDE controllers - see pciide(4) for supported hardware. 168# PCI IDE controllers - see pciide(4) for supported hardware.
171cmdide* at pci? dev ? function ? # CMD tech IDE controllers 169cmdide* at pci? dev ? function ? # CMD tech IDE controllers
172iteide* at pci? dev ? function ? # IT Express IDE controllers 170iteide* at pci? dev ? function ? # IT Express IDE controllers
173satalink* at pci? dev ? function ? # SiI SATALink controllers 171satalink* at pci? dev ? function ? # SiI SATALink controllers
174 172
175# ATA (IDE) bus support 173# ATA (IDE) bus support
176atabus* at ata? 174atabus* at ata?
177 175
178# IDE drives 176# IDE drives
179wd* at atabus? drive ? flags 0x0000 # the drives themselves 177wd* at atabus? drive ? flags 0x0000 # the drives themselves
180 178
181# PCI network interfaces 179# PCI network interfaces
182tlp* at pci? dev ? function ? # DEC Tulip and similar 180tlp* at pci? dev ? function ? # DEC Tulip and similar
183re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S 181re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
184skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet 182skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet
185sk* at skc? # Marvell Yukon Gigabit Ethernet 183sk* at skc? # Marvell Yukon Gigabit Ethernet
186wm* at pci? dev ? function ? # Intel 8254x gigabit 184wm* at pci? dev ? function ? # Intel 8254x gigabit
187fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B 185fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
188 186
189inphy* at mii? phy ? # Intel 82555 PHYs 187inphy* at mii? phy ? # Intel 82555 PHYs
190nsphy* at mii? phy ? # NS83840 PHYs 188nsphy* at mii? phy ? # NS83840 PHYs
191rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs 189rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
192makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs 190makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
193ukphy* at mii? phy ? # generic unknown PHYs 191ukphy* at mii? phy ? # generic unknown PHYs
194 192
195# USB Controller and Devices 193# USB Controller and Devices
196ehci* at pci? dev ? function ? # Enhanced Host Controller 194ehci* at pci? dev ? function ? # Enhanced Host Controller
197ohci* at pci? dev ? function ? # Open Host Controller 195ohci* at pci? dev ? function ? # Open Host Controller
198 196
199# USB bus support 197# USB bus support
200usb* at ehci? 198usb* at ehci?
201usb* at ohci? 199usb* at ohci?
202 200
203# USB Hubs 201# USB Hubs
204uhub* at usb? 202uhub* at usb?
205uhub* at uhub? port ? 203uhub* at uhub? port ?
206 204
207# USB Mass Storage 205# USB Mass Storage
208umass* at uhub? port ? configuration ? interface ? 206umass* at uhub? port ? configuration ? interface ?
209wd* at umass? 207wd* at umass?
210 208
211scsibus* at umass? 209scsibus* at umass?
212sd* at scsibus? target ? lun ? # SCSI disk drives 210sd* at scsibus? target ? lun ? # SCSI disk drives
213 211
214# Veriexec 212# Veriexec
215# 213#
216# a pseudo device needed for veriexec 214# a pseudo device needed for veriexec
217#pseudo-device veriexec 1 215#pseudo-device veriexec 1
218# 216#
219# Uncomment the fingerprint methods below that are desired. Note that 217# Uncomment the fingerprint methods below that are desired. Note that
220# removing fingerprint methods will have almost no impact on the kernel 218# removing fingerprint methods will have almost no impact on the kernel
221# code size. 219# code size.
222# 220#
223#options VERIFIED_EXEC_FP_RMD160 221#options VERIFIED_EXEC_FP_RMD160
224#options VERIFIED_EXEC_FP_SHA256 222#options VERIFIED_EXEC_FP_SHA256
225#options VERIFIED_EXEC_FP_SHA384 223#options VERIFIED_EXEC_FP_SHA384
226#options VERIFIED_EXEC_FP_SHA512 224#options VERIFIED_EXEC_FP_SHA512
227#options VERIFIED_EXEC_FP_SHA1 225#options VERIFIED_EXEC_FP_SHA1
228#options VERIFIED_EXEC_FP_MD5 226#options VERIFIED_EXEC_FP_MD5