diff options
| author | Oleg Safiullin <form@cvs.openbsd.org> | 2007-12-23 17:44:08 +0000 |
|---|---|---|
| committer | Oleg Safiullin <form@cvs.openbsd.org> | 2007-12-23 17:44:08 +0000 |
| commit | 77034fd18c7f36f31b3e5cc87625768cf9870e89 (patch) | |
| tree | 5fde3a257964098d2da9fcf989b2372cdcf86c29 /sys/arch | |
| parent | 75f575f3b45675d47e64a2ed8ab3bcb998d6b3a6 (diff) | |
Look for environment controller first, and access ITE SuperIO address/data
ports only if we found one. Fixes possible issues with some notebook
chipsets.
ok deraadt@
tested by me, jcs@ and Rodolfo Gouveia
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 0ee7f03a01e..9e6aacd4df9 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.208 2007/12/18 21:17:54 form Exp $ +# $OpenBSD: GENERIC,v 1.209 2007/12/23 17:44:07 form Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -71,9 +71,9 @@ lm0 at isa? port 0x290 #lm1 at isa? port 0x280 #lm2 at isa? port 0x310 -it0 at isa? # ITE IT8705F, IT8712F, IT8716F, IT8718F, - # IT8726F and SiS SiS950 monitors and - # watchdog timer +it0 at isa? port 0x290 # ITE IT8705F, IT8712F, IT8716F, IT8718F, +it1 at isa? port 0xc00 # IT8726F and SiS SiS950 monitors and +it2 at isa? port 0xd00 # watchdog timer viaenv* at pci? # VIA VT82C686A hardware monitor #viasio* at isa? port 0x2e flags 0x0000 # VIA VT1211 LPC Super I/O diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 2e55e239316..3ec4beb0af9 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.596 2007/12/18 21:17:54 form Exp $ +# $OpenBSD: GENERIC,v 1.597 2007/12/23 17:44:07 form Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -120,9 +120,10 @@ iic* at nviic? amdpm* at pci? # AMD-7xx/8111 and NForce SMBus controller iic* at amdpm? -it0 at isa? # ITE IT8705F, IT8712F, IT8716F, - # IT8718F, IT8726F and SiS SiS950 - # monitors and watchdog timer +it0 at isa? port 0x290 # ITE IT8705F, IT8712F, IT8716F, +it1 at isa? port 0xc00 # IT8718F, IT8726F and SiS SiS950 +it2 at isa? port 0xd00 # monitors and watchdog timer + viaenv* at pci? # VIA VT82C686A hardware monitor viasio* at isa? port 0x2e flags 0x0000 # VIA VT1211 LPC Super I/O viasio* at isa? port 0x4e flags 0x0000 |