Wed Sep 30 22:19:27 2009 UTC ()
Need sdmmc* at wb?


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

--- src/sys/arch/amd64/conf/GENERIC 2009/09/30 20:49:07 1.255
+++ src/sys/arch/amd64/conf/GENERIC 2009/09/30 22:19:27 1.256
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.255 2009/09/30 20:49:07 jmcneill Exp $ 1# $NetBSD: GENERIC,v 1.256 2009/09/30 22:19:27 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.255 $" 25#ident "GENERIC-$Revision: 1.256 $"
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
@@ -289,26 +289,27 @@ attimer* at acpi? # AT Timer @@ -289,26 +289,27 @@ attimer* at acpi? # AT Timer
289hpqlb* at acpi? # HP Quick Launch Buttons 289hpqlb* at acpi? # HP Quick Launch Buttons
290hpet* at acpi? # High Precision Event Timer 290hpet* at acpi? # High Precision Event Timer
291joy* at acpi? # Joystick/Game port 291joy* at acpi? # Joystick/Game port
292#lpt* at acpi? # Parallel port 292#lpt* at acpi? # Parallel port
293mpu* at acpi? # Roland MPU-401 MIDI UART 293mpu* at acpi? # Roland MPU-401 MIDI UART
294pckbc* at acpi? # PC keyboard controller 294pckbc* at acpi? # PC keyboard controller
295pcppi* at acpi? # AT-style speaker sound 295pcppi* at acpi? # AT-style speaker sound
296sony* at acpi? # Sony Notebook Controller 296sony* at acpi? # Sony Notebook Controller
297spic* at acpi? # Sony Programmable I/O Controller 297spic* at acpi? # Sony Programmable I/O Controller
298wsmouse* at spic? # mouse 298wsmouse* at spic? # mouse
299thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys 299thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
300ug* at acpi? # Abit uGuru Hardware monitor 300ug* at acpi? # Abit uGuru Hardware monitor
301wb* at acpi? # Winbond W83L518D SD/MMC reader 301wb* at acpi? # Winbond W83L518D SD/MMC reader
 302sdmmc* at wb? # SD/MMC bus
302 303
303#apm0 at mainbus0 # Advanced power management 304#apm0 at mainbus0 # Advanced power management
304 305
305# Tuning for power management, see apm(4) for more details. 306# Tuning for power management, see apm(4) for more details.
306#options APM_NO_IDLE # Don't call BIOS CPU idle function 307#options APM_NO_IDLE # Don't call BIOS CPU idle function
307#options APM_V10_ONLY # Use only the APM 1.0 calls 308#options APM_V10_ONLY # Use only the APM 1.0 calls
308#options APM_NO_POWEROFF # Don't power off on halt(8) 309#options APM_NO_POWEROFF # Don't power off on halt(8)
309#options APM_POWER_PRINT # Print stats on the console 310#options APM_POWER_PRINT # Print stats on the console
310#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts 311#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
311 312
312 313
313# Basic Bus Support 314# Basic Bus Support
314 315