Mon Feb 16 22:41:32 2009 UTC ()
Add and enable genfb(4)


(jmcneill)
diff -r1.237 -r1.238 src/sys/arch/amd64/conf/GENERIC
cvs diff -r1.237 -r1.238 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2009/01/29 21:48:13 1.237
+++ src/sys/arch/amd64/conf/GENERIC 2009/02/16 22:41:32 1.238
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.237 2009/01/29 21:48:13 ad Exp $ 1# $NetBSD: GENERIC,v 1.238 2009/02/16 22:41:32 jmcneill 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/amd64/conf/std.amd64" 21include "arch/amd64/conf/std.amd64"
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.237 $" 25#ident "GENERIC-$Revision: 1.238 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# delay between "rebooting ..." message and hardware reset, in milliseconds 29# delay between "rebooting ..." message and hardware reset, in milliseconds
30#options CPURESET_DELAY=2000 30#options CPURESET_DELAY=2000
31 31
32# This option allows you to force a serial console at the specified 32# This option allows you to force a serial console at the specified
33# I/O address. see console(4) for details. 33# I/O address. see console(4) for details.
34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
35# you don't want the option below ON iff you are using the 35# you don't want the option below ON iff you are using the
36# serial console option of the new boot strap code. 36# serial console option of the new boot strap code.
37#options CONS_OVERRIDE # Always use above! independent of boot info 37#options CONS_OVERRIDE # Always use above! independent of boot info
38 38
@@ -345,27 +345,29 @@ cardslot* at cbb? @@ -345,27 +345,29 @@ cardslot* at cbb?
345cardbus* at cardslot? 345cardbus* at cardslot?
346pcmcia* at cardslot? 346pcmcia* at cardslot?
347 347
348# Console Devices 348# Console Devices
349 349
350# wscons 350# wscons
351pckbc0 at isa? # pc keyboard controller 351pckbc0 at isa? # pc keyboard controller
352pckbd* at pckbc? # PC keyboard 352pckbd* at pckbc? # PC keyboard
353pms* at pckbc? # PS/2 mouse for wsmouse 353pms* at pckbc? # PS/2 mouse for wsmouse
354#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume 354#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
355options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads 355options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
356options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads 356options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
357vga* at pci? dev ? function ? 357vga* at pci? dev ? function ?
 358genfb* at pci? dev ? function ?
358wsdisplay* at vga? console ? 359wsdisplay* at vga? console ?
 360wsdisplay* at wsemuldisplaydev?
359wskbd* at pckbd? console ? 361wskbd* at pckbd? console ?
360wsmouse* at pms? mux 0 362wsmouse* at pms? mux 0
361 363
362attimer0 at isa? 364attimer0 at isa?
363pcppi0 at isa? 365pcppi0 at isa?
364sysbeep0 at pcppi? 366sysbeep0 at pcppi?
365 367
366# Cryptographic Devices 368# Cryptographic Devices
367 369
368# PCI cryptographic devices 370# PCI cryptographic devices
369hifn* at pci? dev ? function ? # Hifn 7755/7811/795x 371hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
370ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x 372ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
371 373