diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-08-21 18:29:26 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-08-21 18:29:26 +0000 |
| commit | 689fa171a56417fa66e7101692899adeb19e72b9 (patch) | |
| tree | 4cc4dcc861dd5debdf80d76d41c9099e07677d4a /sys/arch | |
| parent | 083f085a099b0d26bb88989aa8da175bb3c1d9b8 (diff) | |
Use the console locator to make sure wsdisplay0 always is the glass console.
ok miod@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 0ce8c6df112..01efc9fdda8 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.346 2013/08/20 14:27:25 ajacoutot Exp $ +# $OpenBSD: GENERIC,v 1.347 2013/08/21 18:29:25 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -292,7 +292,7 @@ pms* at pckbc? # PS/2 mouse for wsmouse vga0 at isa? option X86EMU # to POST video cards vga* at pci? -wsdisplay* at vga? +wsdisplay0 at vga? console 1 wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 @@ -307,6 +307,7 @@ inteldrm* at vga? # Intel i915, i945 DRM driver drm* at inteldrm? radeondrm* at pci? # ATI Radeon DRM driver drm* at radeondrm? +wsdisplay0 at radeondrm? console 1 wsdisplay* at radeondrm? pcppi0 at isa? diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 72607aabf16..85a81e6f1d1 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.752 2013/08/20 14:27:27 ajacoutot Exp $ +# $OpenBSD: GENERIC,v 1.753 2013/08/21 18:29:25 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -349,8 +349,8 @@ vga0 at isa? option X86EMU # to POST video cards vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? -wsdisplay* at pcdisplay? +wsdisplay0 at vga? console 1 +wsdisplay0 at pcdisplay? console 1 wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 @@ -375,6 +375,7 @@ inteldrm* at vga? # Intel i915, i945 DRM driver drm* at inteldrm? radeondrm* at pci? # ATI Radeon DRM driver drm* at radeondrm? +wsdisplay0 at radeondrm? console 1 wsdisplay* at radeondrm? #option VESABIOSVERBOSE |