summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2004-08-14 17:05:12 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2004-08-14 17:05:12 +0000
commitcf0af1ca4e7437bbb565c489e85be7bda4dae4b1 (patch)
treecc542fc55344530233ef79a319c9d90aa49d3a7b
parent24a6bdb58326c1c8aa5ad3eebfff4e1dfdb33e50 (diff)
Add isa vga to amd64 install media kernels. This makes it possible to
use a normal console to install on systems, such as my Tyan S2885, which find the in-built vga in isa land rather than pci land. Completes earlier work by Tom Cosgrove on GENERIC. ok deraadt@
-rw-r--r--sys/arch/amd64/conf/RAMDISK3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 55b6aeae4bc..99e9b604522 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.11 2004/08/03 00:41:43 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.12 2004/08/14 17:05:11 krw Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -98,6 +98,7 @@ wskbd* at ukbd? console ? mux 1
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? console ?
+vga0 at isa?
vga* at pci? dev ? function ?
wsdisplay* at vga? console ?
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index d42207e976c..33fc818137a 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.13 2004/08/03 00:41:44 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.14 2004/08/14 17:05:11 krw Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -104,6 +104,7 @@ upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network'
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? console ?
+vga0 at isa?
vga* at pci? dev ? function ?
wsdisplay* at vga? console ?