Wed Mar 5 14:13:20 2014 UTC ()
Enabled SYSV* options, which all ports have (and which is needed by 3rd
party software like SANE, e.g.).
Added ugen*.


(phx)
diff -r1.80 -r1.81 src/sys/arch/sandpoint/conf/GENERIC
cvs diff -r1.80 -r1.81 src/sys/arch/sandpoint/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/sandpoint/conf/GENERIC 2013/06/30 21:38:58 1.80
+++ src/sys/arch/sandpoint/conf/GENERIC 2014/03/05 14:13:20 1.81
@@ -1,52 +1,52 @@ @@ -1,52 +1,52 @@
1# $NetBSD: GENERIC,v 1.80 2013/06/30 21:38:58 rmind Exp $ 1# $NetBSD: GENERIC,v 1.81 2014/03/05 14:13:20 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.80 $" 25#ident "GENERIC-$Revision: 1.81 $"
26 26
27maxusers 32 27maxusers 32
28 28
29#options ALTIVEC # Include AltiVec support 29#options ALTIVEC # Include AltiVec support
30 30
31# Standard system options 31# Standard system options
32#options INSECURE # disable kernel security levels 32#options INSECURE # disable kernel security levels
33 33
34options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 34options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
35options KTRACE 35options KTRACE
36 36
37#options SYSVMSG # System V message queues 37options SYSVMSG # System V message queues
38#options SYSVSEM # System V semaphores 38options SYSVSEM # System V semaphores
39#options SYSVSHM # System V shared memory 39options SYSVSHM # System V shared memory
40 40
41#options MODULAR # module(7) support 41#options MODULAR # module(7) support
42#options USERCONF # userconf(4) support 42#options USERCONF # userconf(4) support
43 43
44#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 44#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
45options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 45options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
46 46
47# Enable experimental buffer queue strategy for better responsiveness under 47# Enable experimental buffer queue strategy for better responsiveness under
48# high disk I/O load. Use it with caution - it's not proven to be stable yet. 48# high disk I/O load. Use it with caution - it's not proven to be stable yet.
49#options BUFQ_READPRIO 49#options BUFQ_READPRIO
50#options BUFQ_PRIOCSCAN 50#options BUFQ_PRIOCSCAN
51 51
52# Diagnostic/debugging support options 52# Diagnostic/debugging support options
@@ -195,27 +195,46 @@ options STRTC_NO_WATCHDOG @@ -195,27 +195,46 @@ options STRTC_NO_WATCHDOG
195options STRTC_NO_USERRAM 195options STRTC_NO_USERRAM
196 196
197# PCI IDE controllers - see pciide(4) for supported hardware. 197# PCI IDE controllers - see pciide(4) for supported hardware.
198acardide* at pci? dev ? function ? # Acard IDE controllers 198acardide* at pci? dev ? function ? # Acard IDE controllers
199cmdide* at pci? dev ? function ? # CMD tech IDE controllers 199cmdide* at pci? dev ? function ? # CMD tech IDE controllers
200iteide* at pci? dev ? function ? # IT Express IDE controllers 200iteide* at pci? dev ? function ? # IT Express IDE controllers
201satalink* at pci? dev ? function ? # SiI SATALink controllers 201satalink* at pci? dev ? function ? # SiI SATALink controllers
202viaide* at pci? dev ? function ? # VIA IDE controllers 202viaide* at pci? dev ? function ? # VIA IDE controllers
203 203
204# ATA (IDE) bus support 204# ATA (IDE) bus support
205atabus* at ata? 205atabus* at ata?
206 206
207# IDE drives 207# IDE drives
208wd* at atabus? drive ? flags 0x0000 # the drives themselves 208# Flags are used only with controllers that support DMA operations
 209# and mode settings (e.g. some pciide controllers)
 210# The lowest order four bits (rightmost digit) of the flags define the PIO
 211# mode to use, the next set of four bits the DMA mode and the third set the
 212# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
 213# to use, and the last bit must be 1 for this setting to be used.
 214# For DMA and UDMA, 0xf (1111) means 'disable'.
 215# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
 216# (0xc=1100, 0xa=1010, 0xf=1111)
 217# 0x0000 means "use whatever the drive claims to support".
 218wd* at atabus? drive ? flags 0x0000
 219
 220# ATAPI bus support
 221atapibus* at atapi?
 222
 223# ATAPI devices
 224# flags have the same meaning as for IDE drives.
 225cd* at atapibus? drive ? flags 0x0000 # ATAPI CD-ROM drives
 226sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives
 227uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
209 228
210# PCI network interfaces 229# PCI network interfaces
211ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g 230ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g
212re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S 231re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
213skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet 232skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet
214sk* at skc? # Marvell Yukon Gigabit Ethernet 233sk* at skc? # Marvell Yukon Gigabit Ethernet
215stge* at pci? dev ? function ? # Sundance ST1023 Gigabit 234stge* at pci? dev ? function ? # Sundance ST1023 Gigabit
216tlp* at pci? dev ? function ? # DEC Tulip and similar 235tlp* at pci? dev ? function ? # DEC Tulip and similar
217wm* at pci? dev ? function ? # Intel 8254x Gigabit Ethernet 236wm* at pci? dev ? function ? # Intel 8254x Gigabit Ethernet
218 237
219inphy* at mii? phy ? # Intel 82555 PHYs 238inphy* at mii? phy ? # Intel 82555 PHYs
220nsphy* at mii? phy ? # NS83840 PHYs 239nsphy* at mii? phy ? # NS83840 PHYs
221rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs 240rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
@@ -237,39 +256,43 @@ usb* at ohci? @@ -237,39 +256,43 @@ usb* at ohci?
237uhub* at usb? 256uhub* at usb?
238uhub* at uhub? port ? 257uhub* at uhub? port ?
239 258
240# USB HID devices 259# USB HID devices
241uhidev* at uhub? port ? configuration ? interface ? # USB HID device 260uhidev* at uhub? port ? configuration ? interface ? # USB HID device
242uthum* at uhidev? reportid ? # TEMPerHUM sensors 261uthum* at uhidev? reportid ? # TEMPerHUM sensors
243uhid* at uhidev? reportid ? # USB Generic HID 262uhid* at uhidev? reportid ? # USB Generic HID
244 263
245# USB video 264# USB video
246uvideo* at uhub? # USB Video Class capture devices 265uvideo* at uhub? # USB Video Class capture devices
247video* at videobus? 266video* at videobus?
248 267
249# USB printer 268# USB printer
250ulpt* at uhub? port ? configuration ? interface ? # USB Printer 269ulpt* at uhub? port ? configuration ? interface ?
251 270
252# USB Mass Storage 271# USB Mass Storage
253umass* at uhub? port ? configuration ? interface ? 272umass* at uhub? port ? configuration ? interface ?
254wd* at umass? 273wd* at umass?
255 274
256scsibus* at umass? 275# USB scanners
257sd* at scsibus? target ? lun ? # SCSI disk drives 276#uscanner* at uhub? port ?
258cd* at scsibus? target ? lun ? # SCSI CD-ROM drives 277ugen* at uhub? port ? configuration ? interface ? # USB Generic driver
 278
 279# SCSI bus support
 280scsibus* at umass?
 281
 282# SCSI devices
 283sd* at scsibus? target ? lun ? # SCSI disk drives
 284cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
259 285
260atapibus* at atapi? 
261sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives 
262cd* at atapibus? drive ? flags 0x0000 # ATAPI CD-ROM drives 
263 286
264# 287#
265# Pseudo-Devices 288# Pseudo-Devices
266# 289#
267#pseudo-device crypto # /dev/crypto device 290#pseudo-device crypto # /dev/crypto device
268#pseudo-device swcrypto # software crypto implementation 291#pseudo-device swcrypto # software crypto implementation
269 292
270# disk/mass storage pseudo-devices 293# disk/mass storage pseudo-devices
271#pseudo-device ccd # concatenated/striped disk devices 294#pseudo-device ccd # concatenated/striped disk devices
272#pseudo-device cgd # cryptographic disk devices 295#pseudo-device cgd # cryptographic disk devices
273pseudo-device fss # file system snapshot device 296pseudo-device fss # file system snapshot device
274#pseudo-device putter # for puffs and pud 297#pseudo-device putter # for puffs and pud
275 298