summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-10-07 18:41:08 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-10-07 18:41:08 +0000
commit042762629ae171662af5c1caeee0b2d3797e2230 (patch)
tree4b8a0de6bfa0febd341c88072b9495fa1ee56eb4 /sys/arch/amd64
parentd297dc193bfe20930e7d8c895fb00f4b5e0eab99 (diff)
Add a driver, amdpcib(4), for the AMD 8111 series LPC bridge and HPET written
by mickey, man page by me. Help, suggestions by Theo and jmc. Enable this driver and glxpcib(4) in all RAMDISK kernel, but glxpcib(4) does not provide the watchdog timer in the RAMDISK kernels. Prodded by deraadt. E
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/files.amd649
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 92c658c0362..20d7007b35a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.198 2007/09/30 10:16:56 jsg Exp $
+# $OpenBSD: GENERIC,v 1.199 2007/10/07 18:41:07 mbalmer Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -35,6 +35,7 @@ bios0 at mainbus?
cpu0 at mainbus?
isa0 at mainbus0
isa0 at pcib?
+isa0 at amdpcib?
pci* at mainbus0
#option ACPIVERBOSE
@@ -62,6 +63,7 @@ ppb* at pci? # PCI-PCI bridges
pci* at ppb?
pci* at pchb?
pcib* at pci? # PCI-ISA bridge
+amdpcib* at pci? # AMD 8111 LPC bridge
# National Semiconductor LM7[89] and compatible hardware monitors
lm0 at isa? port 0x290
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index bb14e4e4ae7..3c5fa842f78 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.34 2007/09/12 18:18:27 deraadt Exp $
+# $OpenBSD: files.amd64,v 1.35 2007/10/07 18:41:07 mbalmer Exp $
maxpartitions 16
maxusers 2 16 128
@@ -127,7 +127,12 @@ include "dev/pcmcia/files.pcmcia"
# PCI-ISA bridges
device pcib: isabus
attach pcib at pci
-file arch/amd64/pci/pcib.c pcib
+file arch/amd64/pci/pcib.c pcib | amdpcib
+
+# AMD 8111 LPC bridge
+device amdpcib: isabus
+attach amdpcib at pci
+file dev/pci/amdpcib.c amdpcib
device aapic
attach aapic at pci