Sun Aug 9 20:27:06 2009 UTC ()
remove drm stuff for now


(christos)
diff -r1.247 -r1.248 src/sys/arch/amd64/conf/GENERIC
cvs diff -r1.247 -r1.248 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2009/08/09 19:37:35 1.247
+++ src/sys/arch/amd64/conf/GENERIC 2009/08/09 20:27:06 1.248
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.247 2009/08/09 19:37:35 christos Exp $ 1# $NetBSD: GENERIC,v 1.248 2009/08/09 20:27:06 christos 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.247 $" 25#ident "GENERIC-$Revision: 1.248 $"
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
@@ -359,36 +359,26 @@ pms* at pckbc? # PS/2 mouse for wsmous @@ -359,36 +359,26 @@ pms* at pckbc? # PS/2 mouse for wsmous
359options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads 359options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
360options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads 360options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
361vga* at pci? dev ? function ? 361vga* at pci? dev ? function ?
362genfb* at pci? dev ? function ? 362genfb* at pci? dev ? function ?
363wsdisplay* at vga? console ? 363wsdisplay* at vga? console ?
364wsdisplay* at wsemuldisplaydev? 364wsdisplay* at wsemuldisplaydev?
365wskbd* at pckbd? console ? 365wskbd* at pckbd? console ?
366wsmouse* at pms? mux 0 366wsmouse* at pms? mux 0
367 367
368attimer0 at isa? 368attimer0 at isa?
369pcppi0 at isa? 369pcppi0 at isa?
370sysbeep0 at pcppi? 370sysbeep0 at pcppi?
371 371
372# DRI driver 
373i915drm* at vga? # Intel i915, i945 DRM driver 
374mach64drm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver 
375mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver 
376r128drm* at vga? # ATI Rage 128 DRM driver 
377radeondrm* at vga? # ATI Radeon DRM driver 
378savagedrm* at vga? # S3 Savage DRM driver 
379sisdrm* at vga? # SiS DRM driver 
380tdfxdrm* at vga? # 3dfx (voodoo) DRM driver 
381 
382# Cryptographic Devices 372# Cryptographic Devices
383 373
384# PCI cryptographic devices 374# PCI cryptographic devices
385hifn* at pci? dev ? function ? # Hifn 7755/7811/795x 375hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
386ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x 376ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
387 377
388# Serial Devices 378# Serial Devices
389 379
390# PCI serial interfaces 380# PCI serial interfaces
391com* at puc? port ? # 16x50s on "universal" comm boards 381com* at puc? port ? # 16x50s on "universal" comm boards
392cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards 382cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
393cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards 383cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
394 384