summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorPaul Irofti <pirofti@cvs.openbsd.org>2009-06-06 00:35:01 +0000
committerPaul Irofti <pirofti@cvs.openbsd.org>2009-06-06 00:35:01 +0000
commitae8d51383026ad58c6f4a80c429d1ea6baeef3f2 (patch)
tree30925450336d18c4ea9ec48e94ea312a02616b1b /sys/arch/i386/conf
parent0beb67fb1755f6972960b884f8640f623226401c (diff)
Add vga bios repost support. Fetched from the NetBSD tree mostly.
Tested on multiple i386 and it works, amd64 works also with a few exceptions that will get fixed. The initial effort of importing was done by oga@, thanks! Lots of testing and debugging by mlarkin@ and me. Okay deraadt@, oga@, mlarkin@.
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/files.i3863
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 58c27ebc64b..8d2c87edc0b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.662 2009/06/03 07:13:48 pirofti Exp $
+# $OpenBSD: GENERIC,v 1.663 2009/06/06 00:35:00 pirofti Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -340,6 +340,7 @@ pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
vga0 at isa?
+option VGA_POST # we can re-POST video cards
vga* at pci?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga?
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 354a4f0083c..ffe4ccef9e1 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.190 2009/05/12 19:49:36 mglocker Exp $
+# $OpenBSD: files.i386,v 1.191 2009/06/06 00:35:00 pirofti Exp $
#
# new style config file for i386 architecture
#
@@ -103,6 +103,7 @@ include "../../../dev/pci/files.pci"
file arch/i386/pci/pci_machdep.c pci
file arch/i386/pci/pciide_machdep.c pciide
file arch/i386/pci/pcic_pci_machdep.c pcic_pci
+file arch/i386/pci/vga_post.c vga_pci & vga_post
# PCI-Host bridge chipsets
device pchb: pcibus, agpbus