Move all platforms to new dbCool driver in preparation for removal of chip-specific driversdiff -r1.228 -r1.229 src/sys/arch/amd64/conf/GENERIC
(pgoyette)
--- src/sys/arch/amd64/conf/GENERIC 2008/10/07 09:30:04 1.228
+++ src/sys/arch/amd64/conf/GENERIC 2008/10/07 12:43:31 1.229
@@ -1,38 +1,38 @@ | @@ -1,38 +1,38 @@ | |||
1 | # $NetBSD: GENERIC,v 1.228 2008/10/07 09:30:04 rmind Exp $ | 1 | # $NetBSD: GENERIC,v 1.229 2008/10/07 12:43:31 pgoyette 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 | |||
21 | include "arch/amd64/conf/std.amd64" | 21 | include "arch/amd64/conf/std.amd64" | |
22 | 22 | |||
23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
24 | 24 | |||
25 | #ident "GENERIC-$Revision: 1.228 $" | 25 | #ident "GENERIC-$Revision: 1.229 $" | |
26 | 26 | |||
27 | maxusers 64 # estimated number of users | 27 | maxusers 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 | |||
@@ -419,29 +419,30 @@ nfsmb* at nfsmbc? | @@ -419,29 +419,30 @@ nfsmb* at nfsmbc? | |||
419 | iic* at nfsmb? | 419 | iic* at nfsmb? | |
420 | 420 | |||
421 | # Intel PIIX4 power management controllers | 421 | # Intel PIIX4 power management controllers | |
422 | piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller | 422 | piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller | |
423 | iic* at piixpm? # SMBus on PIIX4 | 423 | iic* at piixpm? # SMBus on PIIX4 | |
424 | 424 | |||
425 | # Intel Core's on-die Thermal sensor | 425 | # Intel Core's on-die Thermal sensor | |
426 | options INTEL_CORETEMP | 426 | options INTEL_CORETEMP | |
427 | 427 | |||
428 | # Intel ICH SMBus controller | 428 | # Intel ICH SMBus controller | |
429 | ichsmb* at pci? dev ? function ? | 429 | ichsmb* at pci? dev ? function ? | |
430 | iic* at ichsmb? | 430 | iic* at ichsmb? | |
431 | 431 | |||
432 | #adt7463c* at iic? addr 0x2C # Unknown other motherboard(s) | 432 | # Thermal monitor and fan controller | |
433 | #adt7463c* at iic? addr 0x2D # Tyan S2881 | 433 | #dbcool* at iic? addr 0x2C # Unknown other motherboard(s) | |
434 | #adt7463c* at iic? addr 0x2E # Tyan S2882-D | 434 | #dbcool* at iic? addr 0x2D # Tyan S2881 | |
435 | #dbcool* at iic? addr 0x2E # Tyan S2882-D | |||
435 | 436 | |||
436 | # Fintek Super I/O with hardware monitor | 437 | # Fintek Super I/O with hardware monitor | |
437 | #finsio0 at isa? port 0x4e | 438 | #finsio0 at isa? port 0x4e | |
438 | 439 | |||
439 | # iTE IT87xxF Super I/O with watchdog and sensors support | 440 | # iTE IT87xxF Super I/O with watchdog and sensors support | |
440 | #itesio0 at isa? port 0x2e | 441 | #itesio0 at isa? port 0x2e | |
441 | 442 | |||
442 | # Abit uGuru Hardware system monitor | 443 | # Abit uGuru Hardware system monitor | |
443 | #ug0 at isa? port 0xe0 | 444 | #ug0 at isa? port 0xe0 | |
444 | 445 | |||
445 | # Serial Presence Detect capable memory modules | 446 | # Serial Presence Detect capable memory modules | |
446 | #spdmem* at iic? addr 0x50 | 447 | #spdmem* at iic? addr 0x50 | |
447 | #spdmem* at iic? addr 0x51 | 448 | #spdmem* at iic? addr 0x51 |
--- src/sys/arch/amd64/conf/XEN3_DOM0 2008/09/30 16:46:56 1.29
+++ src/sys/arch/amd64/conf/XEN3_DOM0 2008/10/07 12:43:31 1.30
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: XEN3_DOM0,v 1.29 2008/09/30 16:46:56 jmcneill Exp $ | 1 | # $NetBSD: XEN3_DOM0,v 1.30 2008/10/07 12:43:31 pgoyette Exp $ | |
2 | 2 | |||
3 | include "arch/amd64/conf/std.xen" | 3 | include "arch/amd64/conf/std.xen" | |
4 | 4 | |||
5 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 5 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
6 | 6 | |||
7 | #options UVMHIST | 7 | #options UVMHIST | |
8 | #options UVMHIST_PRINT | 8 | #options UVMHIST_PRINT | |
9 | #options SYSCALL_DEBUG | 9 | #options SYSCALL_DEBUG | |
10 | 10 | |||
11 | maxusers 32 # estimated number of users | 11 | maxusers 32 # estimated number of users | |
12 | 12 | |||
13 | # | 13 | # | |
14 | options DOM0OPS | 14 | options DOM0OPS | |
@@ -263,29 +263,31 @@ com1 at isa? port 0x2f8 irq 3 | @@ -263,29 +263,31 @@ com1 at isa? port 0x2f8 irq 3 | |||
263 | # PCI parallel printer interfaces | 263 | # PCI parallel printer interfaces | |
264 | lpt* at puc? port ? # || ports on "universal" comm boards | 264 | lpt* at puc? port ? # || ports on "universal" comm boards | |
265 | 265 | |||
266 | # ISA parallel printer interfaces | 266 | # ISA parallel printer interfaces | |
267 | lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports | 267 | lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports | |
268 | 268 | |||
269 | # Hardware monitors | 269 | # Hardware monitors | |
270 | 270 | |||
271 | amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors | 271 | amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors | |
272 | 272 | |||
273 | # AMD 768 and 8111 power/ACPI controllers | 273 | # AMD 768 and 8111 power/ACPI controllers | |
274 | amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface | 274 | amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface | |
275 | #iic* at amdpm? # sensors below are on this bus | 275 | #iic* at amdpm? # sensors below are on this bus | |
276 | #adt7463c* at iic? addr 0x2C # Unknown other motherboard(s) | 276 | ||
277 | #adt7463c* at iic? addr 0x2D # Tyan S2881 | 277 | # Thermal monitor and fan controller | |
278 | #adt7463c* at iic? addr 0x2E # Tyan S2882-D | 278 | #dbcool* at iic? addr 0x2C # Unknown other motherboard(s) | |
279 | #dbcool* at iic? addr 0x2D # Tyan S2881 | |||
280 | #dbcool* at iic? addr 0x2E # Tyan S2882-D | |||
279 | 281 | |||
280 | # LM7[89] and compatible hardware monitors | 282 | # LM7[89] and compatible hardware monitors | |
281 | #lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00 | 283 | #lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00 | |
282 | 284 | |||
283 | # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer | 285 | # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer | |
284 | #viaenv* at pci? dev ? function ? | 286 | #viaenv* at pci? dev ? function ? | |
285 | 287 | |||
286 | 288 | |||
287 | # PCI network interfaces | 289 | # PCI network interfaces | |
288 | an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) | 290 | an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) | |
289 | ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 | 291 | ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 | |
290 | atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) | 292 | atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) | |
291 | bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet | 293 | bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet |
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC 2008/09/20 18:19:11 1.4
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC 2008/10/07 12:43:31 1.5
@@ -1,38 +1,38 @@ | @@ -1,38 +1,38 @@ | |||
1 | # $NetBSD: MPCSA_GENERIC,v 1.4 2008/09/20 18:19:11 tsutsui Exp $ | 1 | # $NetBSD: MPCSA_GENERIC,v 1.5 2008/10/07 12:43:31 pgoyette 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 | |||
21 | include "arch/evbarm/conf/std.mpcsa" | 21 | include "arch/evbarm/conf/std.mpcsa" | |
22 | 22 | |||
23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
24 | 24 | |||
25 | #ident "GENERIC-$Revision: 1.4 $" | 25 | #ident "GENERIC-$Revision: 1.5 $" | |
26 | 26 | |||
27 | maxusers 32 # estimated number of users | 27 | maxusers 32 # estimated number of users | |
28 | 28 | |||
29 | # CPU support. | 29 | # CPU support. | |
30 | options CPU_ARM9 # Support the ARM9TDMI core | 30 | options CPU_ARM9 # Support the ARM9TDMI core | |
31 | makeoptions CPUFLAGS="-mtune=arm920t -mcpu=arm920t" | 31 | makeoptions CPUFLAGS="-mtune=arm920t -mcpu=arm920t" | |
32 | 32 | |||
33 | # CPU-related options. | 33 | # CPU-related options. | |
34 | #options MATH_EMULATE # floating point emulation | 34 | #options MATH_EMULATE # floating point emulation | |
35 | 35 | |||
36 | # doesn't work with MP just yet.. | 36 | # doesn't work with MP just yet.. | |
37 | #options PERFCTRS # performance-monitoring counters support | 37 | #options PERFCTRS # performance-monitoring counters support | |
38 | 38 | |||
@@ -324,29 +324,29 @@ seeprom* at iic0 addr 0x50 size 4096 | @@ -324,29 +324,29 @@ seeprom* at iic0 addr 0x50 size 4096 | |||
324 | 324 | |||
325 | # Console Devices | 325 | # Console Devices | |
326 | 326 | |||
327 | # PCMCIA serial interfaces | 327 | # PCMCIA serial interfaces | |
328 | com* at pcmcia? function ? # Modems and serial cards | 328 | com* at pcmcia? function ? # Modems and serial cards | |
329 | 329 | |||
330 | pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards | 330 | pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards | |
331 | com* at pcmcom? slave ? # ...and the slave devices | 331 | com* at pcmcom? slave ? # ...and the slave devices | |
332 | 332 | |||
333 | 333 | |||
334 | # Hardware monitors | 334 | # Hardware monitors | |
335 | 335 | |||
336 | # AMD 768 and 8111 power/ACPI controllers | 336 | # AMD 768 and 8111 power/ACPI controllers | |
337 | #adt7463c* at iic? addr 0x2C # Unknown other motherboard(s) | 337 | #dbcool* at iic? addr 0x2C # Unknown other motherboard(s) | |
338 | #adt7463c* at iic? addr 0x2D # Tyan S2881 | 338 | #dbcool* at iic? addr 0x2D # Tyan S2881 | |
339 | #adt7463c* at iic? addr 0x2E # Tyan S2882-D | 339 | #dbcool* at iic? addr 0x2E # Tyan S2882-D | |
340 | 340 | |||
341 | # 1-Wire support | 341 | # 1-Wire support | |
342 | #gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio | 342 | #gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio | |
343 | #onewire* at gpioow? | 343 | #onewire* at gpioow? | |
344 | 344 | |||
345 | # 1-Wire devices | 345 | # 1-Wire devices | |
346 | #owtemp* at onewire? # Temperature sensors | 346 | #owtemp* at onewire? # Temperature sensors | |
347 | 347 | |||
348 | # SCSI Controllers and Devices | 348 | # SCSI Controllers and Devices | |
349 | 349 | |||
350 | # PCMCIA SCSI controllers | 350 | # PCMCIA SCSI controllers | |
351 | #aic* at pcmcia? function ? # Adaptec APA-1460 SCSI | 351 | #aic* at pcmcia? function ? # Adaptec APA-1460 SCSI | |
352 | #esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI | 352 | #esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI |
--- src/sys/arch/i386/conf/ALL 2008/09/30 16:45:33 1.181
+++ src/sys/arch/i386/conf/ALL 2008/10/07 12:43:32 1.182
@@ -1,33 +1,33 @@ | @@ -1,33 +1,33 @@ | |||
1 | # $NetBSD: ALL,v 1.181 2008/09/30 16:45:33 jmcneill Exp $ | 1 | # $NetBSD: ALL,v 1.182 2008/10/07 12:43:32 pgoyette Exp $ | |
2 | # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp | 2 | # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp | |
3 | # | 3 | # | |
4 | # ALL machine description file | 4 | # ALL machine description file | |
5 | # | 5 | # | |
6 | # This machine description includes all devices and options and it is | 6 | # This machine description includes all devices and options and it is | |
7 | # used to compile-test the source and does not necessarily produce a | 7 | # used to compile-test the source and does not necessarily produce a | |
8 | # bootable or useful kernel. | 8 | # bootable or useful kernel. | |
9 | # | 9 | # | |
10 | # For further information on hardware support for this architecture, see | 10 | # For further information on hardware support for this architecture, see | |
11 | # the intro(4) man page. For further information about kernel options | 11 | # the intro(4) man page. For further information about kernel options | |
12 | # for this architecture, see the options(4) man page. For an explanation | 12 | # for this architecture, see the options(4) man page. For an explanation | |
13 | # of each device driver in this file see the section 4 man page for the | 13 | # of each device driver in this file see the section 4 man page for the | |
14 | # device. | 14 | # device. | |
15 | 15 | |||
16 | include "arch/i386/conf/std.i386" | 16 | include "arch/i386/conf/std.i386" | |
17 | 17 | |||
18 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 18 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
19 | 19 | |||
20 | #ident "ALL-$Revision: 1.181 $" | 20 | #ident "ALL-$Revision: 1.182 $" | |
21 | 21 | |||
22 | maxusers 32 # estimated number of users | 22 | maxusers 32 # estimated number of users | |
23 | 23 | |||
24 | # CPU-related options. | 24 | # CPU-related options. | |
25 | options VM86 # virtual 8086 emulation | 25 | options VM86 # virtual 8086 emulation | |
26 | options USER_LDT # user-settable LDT; used by WINE | 26 | options USER_LDT # user-settable LDT; used by WINE | |
27 | 27 | |||
28 | # Enhanced SpeedStep Technology in the Pentium M | 28 | # Enhanced SpeedStep Technology in the Pentium M | |
29 | options ENHANCED_SPEEDSTEP | 29 | options ENHANCED_SPEEDSTEP | |
30 | options EST_FREQ_USERWRITE # any user can set frequency | 30 | options EST_FREQ_USERWRITE # any user can set frequency | |
31 | 31 | |||
32 | # AMD PowerNow! K7 | 32 | # AMD PowerNow! K7 | |
33 | options POWERNOW_K7 | 33 | options POWERNOW_K7 | |
@@ -630,29 +630,30 @@ options INTEL_CORETEMP | @@ -630,29 +630,30 @@ options INTEL_CORETEMP | |||
630 | # Intel ICH SMBus controller | 630 | # Intel ICH SMBus controller | |
631 | ichsmb* at pci? dev ? function ? | 631 | ichsmb* at pci? dev ? function ? | |
632 | iic* at ichsmb? | 632 | iic* at ichsmb? | |
633 | 633 | |||
634 | # NVIDIA nForce2/3/4 SMBus controller | 634 | # NVIDIA nForce2/3/4 SMBus controller | |
635 | nfsmbc* at pci? dev ? function ? | 635 | nfsmbc* at pci? dev ? function ? | |
636 | nfsmb* at nfsmbc? | 636 | nfsmb* at nfsmbc? | |
637 | iic* at nfsmb? | 637 | iic* at nfsmb? | |
638 | 638 | |||
639 | # Intel PIIX4 power management controllers | 639 | # Intel PIIX4 power management controllers | |
640 | piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller | 640 | piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller | |
641 | iic* at piixpm? # SMBus on PIIX4 | 641 | iic* at piixpm? # SMBus on PIIX4 | |
642 | 642 | |||
643 | adt7463c* at iic? addr 0x2C # Unknown other motherboard(s) | 643 | # dbCool thermal monitor and fan controller | |
644 | adt7463c* at iic? addr 0x2D # Tyan S2881 | 644 | dbcool* at iic? addr 0x2C # Unknown other motherboard(s) | |
645 | adt7463c* at iic? addr 0x2E # Tyan S2882-D | 645 | dbcool* at iic? addr 0x2D # Tyan S2881 | |
646 | dbcool* at iic? addr 0x2E # Tyan S2882-D | |||
646 | 647 | |||
647 | pic16lc* at iic? addr 0x10 # XBOX PIC16LC | 648 | pic16lc* at iic? addr 0x10 # XBOX PIC16LC | |
648 | xbseeprom* at iic? addr 0x54 # XBOX serial EEPROM | 649 | xbseeprom* at iic? addr 0x54 # XBOX serial EEPROM | |
649 | 650 | |||
650 | # IBM Thinkpad Active Protection System | 651 | # IBM Thinkpad Active Protection System | |
651 | aps0 at isa? port 0x1600 | 652 | aps0 at isa? port 0x1600 | |
652 | 653 | |||
653 | # Fintek Super I/O with hardware monitor | 654 | # Fintek Super I/O with hardware monitor | |
654 | finsio0 at isa? port 0x4e | 655 | finsio0 at isa? port 0x4e | |
655 | 656 | |||
656 | # iTE IT87xxF Super I/O with watchdog and sensors support | 657 | # iTE IT87xxF Super I/O with watchdog and sensors support | |
657 | itesio0 at isa? port 0x2e | 658 | itesio0 at isa? port 0x2e | |
658 | 659 |
--- src/sys/arch/i386/conf/GENERIC 2008/10/07 09:30:04 1.911
+++ src/sys/arch/i386/conf/GENERIC 2008/10/07 12:43:32 1.912
@@ -1,38 +1,38 @@ | @@ -1,38 +1,38 @@ | |||
1 | # $NetBSD: GENERIC,v 1.911 2008/10/07 09:30:04 rmind Exp $ | 1 | # $NetBSD: GENERIC,v 1.912 2008/10/07 12:43:32 pgoyette 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 | |||
21 | include "arch/i386/conf/std.i386" | 21 | include "arch/i386/conf/std.i386" | |
22 | 22 | |||
23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
24 | 24 | |||
25 | #ident "GENERIC-$Revision: 1.911 $" | 25 | #ident "GENERIC-$Revision: 1.912 $" | |
26 | 26 | |||
27 | maxusers 64 # estimated number of users | 27 | maxusers 64 # estimated number of users | |
28 | 28 | |||
29 | makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, | 29 | makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, | |
30 | # tune for more modern | 30 | # tune for more modern | |
31 | 31 | |||
32 | # CPU-related options. | 32 | # CPU-related options. | |
33 | options VM86 # virtual 8086 emulation | 33 | options VM86 # virtual 8086 emulation | |
34 | options USER_LDT # user-settable LDT; used by WINE | 34 | options USER_LDT # user-settable LDT; used by WINE | |
35 | 35 | |||
36 | # Enhanced SpeedStep Technology in the Pentium M | 36 | # Enhanced SpeedStep Technology in the Pentium M | |
37 | options ENHANCED_SPEEDSTEP | 37 | options ENHANCED_SPEEDSTEP | |
38 | #options EST_FREQ_USERWRITE # any user can set frequency | 38 | #options EST_FREQ_USERWRITE # any user can set frequency | |
@@ -622,29 +622,30 @@ options INTEL_CORETEMP | @@ -622,29 +622,30 @@ options INTEL_CORETEMP | |||
622 | # Intel ICH SMBus controller | 622 | # Intel ICH SMBus controller | |
623 | ichsmb* at pci? dev ? function ? | 623 | ichsmb* at pci? dev ? function ? | |
624 | iic* at ichsmb? | 624 | iic* at ichsmb? | |
625 | 625 | |||
626 | # NVIDIA nForce2/3/4 SMBus controller | 626 | # NVIDIA nForce2/3/4 SMBus controller | |
627 | nfsmbc* at pci? dev ? function ? | 627 | nfsmbc* at pci? dev ? function ? | |
628 | nfsmb* at nfsmbc? | 628 | nfsmb* at nfsmbc? | |
629 | iic* at nfsmb? | 629 | iic* at nfsmb? | |
630 | 630 | |||
631 | # Intel PIIX4 power management controllers | 631 | # Intel PIIX4 power management controllers | |
632 | piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller | 632 | piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller | |
633 | iic* at piixpm? # SMBus on PIIX4 | 633 | iic* at piixpm? # SMBus on PIIX4 | |
634 | 634 | |||
635 | #adt7463c* at iic? addr 0x2C # Unknown other motherboard(s) | 635 | # dbCool Thermal monitor and fan controller | |
636 | #adt7463c* at iic? addr 0x2D # Tyan S2881 | 636 | #dbcool* at iic? addr 0x2C # Unknown other motherboard(s) | |
637 | #adt7463c* at iic? addr 0x2E # Tyan S2882-D | 637 | #dbcool* at iic? addr 0x2D # Tyan S2881 | |
638 | #dbcool* at iic? addr 0x2E # Tyan S2882-D | |||
638 | 639 | |||
639 | # IBM Thinkpad Active Protection System | 640 | # IBM Thinkpad Active Protection System | |
640 | #aps0 at isa? port 0x1600 | 641 | #aps0 at isa? port 0x1600 | |
641 | 642 | |||
642 | # Fintek Super I/O with hardware monitor | 643 | # Fintek Super I/O with hardware monitor | |
643 | #finsio0 at isa? port 0x4e | 644 | #finsio0 at isa? port 0x4e | |
644 | 645 | |||
645 | # iTE IT87xxF Super I/O with watchdog and sensors support | 646 | # iTE IT87xxF Super I/O with watchdog and sensors support | |
646 | #itesio0 at isa? port 0x2e | 647 | #itesio0 at isa? port 0x2e | |
647 | 648 | |||
648 | # LM7[89] and compatible hardware monitors | 649 | # LM7[89] and compatible hardware monitors | |
649 | #lm0 at isa? port 0x290 # other common: 0x280, 0x310 | 650 | #lm0 at isa? port 0x290 # other common: 0x280, 0x310 | |
650 | 651 |
--- src/sys/arch/i386/conf/Attic/XEN2_DOM0 2008/09/30 16:45:33 1.50
+++ src/sys/arch/i386/conf/Attic/XEN2_DOM0 2008/10/07 12:43:32 1.51
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: XEN2_DOM0,v 1.50 2008/09/30 16:45:33 jmcneill Exp $ | 1 | # $NetBSD: XEN2_DOM0,v 1.51 2008/10/07 12:43:32 pgoyette Exp $ | |
2 | 2 | |||
3 | include "arch/xen/conf/std.xen" | 3 | include "arch/xen/conf/std.xen" | |
4 | 4 | |||
5 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 5 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
6 | 6 | |||
7 | #options UVMHIST | 7 | #options UVMHIST | |
8 | #options UVMHIST_PRINT | 8 | #options UVMHIST_PRINT | |
9 | #options SYSCALL_DEBUG | 9 | #options SYSCALL_DEBUG | |
10 | 10 | |||
11 | maxusers 32 # estimated number of users | 11 | maxusers 32 # estimated number of users | |
12 | 12 | |||
13 | # | 13 | # | |
14 | options XEN | 14 | options XEN | |
@@ -245,30 +245,32 @@ com1 at isa? port 0x2f8 irq 3 | @@ -245,30 +245,32 @@ com1 at isa? port 0x2f8 irq 3 | |||
245 | 245 | |||
246 | # PCI parallel printer interfaces | 246 | # PCI parallel printer interfaces | |
247 | lpt* at puc? port ? # || ports on "universal" comm boards | 247 | lpt* at puc? port ? # || ports on "universal" comm boards | |
248 | 248 | |||
249 | # ISA parallel printer interfaces | 249 | # ISA parallel printer interfaces | |
250 | lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports | 250 | lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports | |
251 | 251 | |||
252 | # Hardware monitors | 252 | # Hardware monitors | |
253 | 253 | |||
254 | amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors | 254 | amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors | |
255 | 255 | |||
256 | # AMD 768 and 8111 power/ACPI controllers | 256 | # AMD 768 and 8111 power/ACPI controllers | |
257 | amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface | 257 | amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface | |
258 | ||||
259 | # dbCool thermal monitor and fan controller | |||
258 | #iic* at amdpm? # sensors below are on this bus | 260 | #iic* at amdpm? # sensors below are on this bus | |
259 | #adt7463c* at iic? addr 0x2C # Unknown other motherboard(s) | 261 | #dbcool* at iic? addr 0x2C # Unknown other motherboard(s) | |
260 | #adt7463c* at iic? addr 0x2D # Tyan S2881 | 262 | #dbcool* at iic? addr 0x2D # Tyan S2881 | |
261 | #adt7463c* at iic? addr 0x2E # Tyan S2882-D | 263 | #dbcool* at iic? addr 0x2E # Tyan S2882-D | |
262 | 264 | |||
263 | # LM7[89] and compatible hardware monitors | 265 | # LM7[89] and compatible hardware monitors | |
264 | #lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00 | 266 | #lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00 | |
265 | 267 | |||
266 | # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer | 268 | # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer | |
267 | #viaenv* at pci? dev ? function ? | 269 | #viaenv* at pci? dev ? function ? | |
268 | 270 | |||
269 | 271 | |||
270 | # PCI network interfaces | 272 | # PCI network interfaces | |
271 | an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) | 273 | an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) | |
272 | ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 | 274 | ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 | |
273 | atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) | 275 | atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) | |
274 | bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet | 276 | bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet |
--- src/sys/arch/macppc/conf/GENERIC 2008/08/26 16:27:07 1.270
+++ src/sys/arch/macppc/conf/GENERIC 2008/10/07 12:43:32 1.271
@@ -1,38 +1,38 @@ | @@ -1,38 +1,38 @@ | |||
1 | # $NetBSD: GENERIC,v 1.270 2008/08/26 16:27:07 macallan Exp $ | 1 | # $NetBSD: GENERIC,v 1.271 2008/10/07 12:43:32 pgoyette 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 | |||
21 | include "arch/macppc/conf/std.macppc" | 21 | include "arch/macppc/conf/std.macppc" | |
22 | 22 | |||
23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
24 | 24 | |||
25 | #ident "GENERIC-$Revision: 1.270 $" | 25 | #ident "GENERIC-$Revision: 1.271 $" | |
26 | 26 | |||
27 | maxusers 32 | 27 | maxusers 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 | |||
34 | options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT | 34 | options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT | |
35 | options NTP # NTP phase/frequency locked loop | 35 | options NTP # NTP phase/frequency locked loop | |
36 | options KTRACE # system call tracing via ktrace(1) | 36 | options KTRACE # system call tracing via ktrace(1) | |
37 | 37 | |||
38 | options SYSVMSG # System V message queues | 38 | options SYSVMSG # System V message queues | |
@@ -388,30 +388,27 @@ sgsmix0 at iic0 addr 0x8a # additional m | @@ -388,30 +388,27 @@ sgsmix0 at iic0 addr 0x8a # additional m | |||
388 | 388 | |||
389 | zsc* at obio? | 389 | zsc* at obio? | |
390 | zstty* at zsc? channel ? | 390 | zstty* at zsc? channel ? | |
391 | mediabay* at obio? | 391 | mediabay* at obio? | |
392 | wdc* at mediabay? flags 0 | 392 | wdc* at mediabay? flags 0 | |
393 | # awacs is disabled because on most systems (7300 - 9600 PowerMacs, | 393 | # awacs is disabled because on most systems (7300 - 9600 PowerMacs, | |
394 | # many kinds of G4s), very heavy load can cause the machine to lock | 394 | # many kinds of G4s), very heavy load can cause the machine to lock | |
395 | # up. ONLY enable this if your machine is never under heavy load, or | 395 | # up. ONLY enable this if your machine is never under heavy load, or | |
396 | # you'd rather have audio than worry about occasional lockups. | 396 | # you'd rather have audio than worry about occasional lockups. | |
397 | #awacs* at obio? # Apple audio device | 397 | #awacs* at obio? # Apple audio device | |
398 | ki2c* at obio? # Keywest I2C | 398 | ki2c* at obio? # Keywest I2C | |
399 | ki2c* at uni_n? # Keywest I2C | 399 | ki2c* at uni_n? # Keywest I2C | |
400 | iic* at ki2c? | 400 | iic* at ki2c? | |
401 | adt7467c* at ki2c? # Analog Devices ADT7467 thermal | 401 | dbcool* at ki2c? # dbCool thermal monitor & fan control | |
402 | # monitor, iBook G4 | |||
403 | adm1030c* at ki2c? # Analog Devices ADM1030 thermal | |||
404 | # monitor, iBook G3 | |||
405 | 402 | |||
406 | deq* at ki2c? # mixer/equalizer, needed by snapper | 403 | deq* at ki2c? # mixer/equalizer, needed by snapper | |
407 | wi* at obio? # AirMac | 404 | wi* at obio? # AirMac | |
408 | snapper* at obio? # Snapper audio device | 405 | snapper* at obio? # Snapper audio device | |
409 | 406 | |||
410 | cardslot* at cbb? | 407 | cardslot* at cbb? | |
411 | cardbus* at cardslot? | 408 | cardbus* at cardslot? | |
412 | pcmcia* at cardslot? | 409 | pcmcia* at cardslot? | |
413 | 410 | |||
414 | com* at pcmcia? function ? # Modems and serial cards | 411 | com* at pcmcia? function ? # Modems and serial cards | |
415 | wdc* at pcmcia? function ? # PCMCIA IDE controllers | 412 | wdc* at pcmcia? function ? # PCMCIA IDE controllers | |
416 | ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet | 413 | ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet | |
417 | mbe* at pcmcia? function ? # MB8696x based Ethernet | 414 | mbe* at pcmcia? function ? # MB8696x based Ethernet |