From: yasuoka Date: Thu, 20 Jul 2023 02:26:24 +0000 (+0000) Subject: Assign wsdisplay0 to the glass console always. The same change is X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=07be88f10e3302b5e14b19f05ee09c1c3650d967;p=openbsd Assign wsdisplay0 to the glass console always. The same change is done for GENERIC already. ok kettenis kn --- diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index cfa1dcac4a2..a9d324d9b9b 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.85 2021/12/26 13:55:36 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.86 2023/07/20 02:26:24 yasuoka Exp $ machine amd64 maxusers 4 @@ -74,7 +74,7 @@ pckbd* at pckbc? # PC keyboard wskbd* at pckbd? mux 1 vga0 at isa? vga* at pci? -wsdisplay* at vga? +wsdisplay0 at vga? console 1 com0 at isa? port 0x3f8 irq 4 # standard PC serial ports com1 at isa? port 0x2f8 irq 3 diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 963d271efd2..8219bf9c9c2 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.201 2023/04/02 03:40:54 kevlo Exp $ +# $OpenBSD: RAMDISK_CD,v 1.202 2023/07/20 02:26:24 yasuoka Exp $ machine amd64 maxusers 4 @@ -149,7 +149,7 @@ pckbd* at pckbc? # PC keyboard wskbd* at pckbd? mux 1 vga0 at isa? vga* at pci? -wsdisplay* at vga? +wsdisplay0 at vga? console 1 efifb0 at mainbus? # EFI Framebuffer wsdisplay0 at efifb? console 1 diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 6fe9b931d80..1008992dbe5 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.201 2021/02/16 00:03:54 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.202 2023/07/20 02:26:24 yasuoka Exp $ machine i386 maxusers 4 @@ -81,8 +81,8 @@ wskbd* at pckbd? mux 1 vga0 at isa? 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 com0 at isa? port 0x3f8 irq 4 # standard PC serial ports com1 at isa? port 0x2f8 irq 3 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index ef01ce2c8c4..995b9c3ab6c 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.252 2022/06/26 20:05:06 sthen Exp $ +# $OpenBSD: RAMDISK_CD,v 1.253 2023/07/20 02:26:24 yasuoka Exp $ machine i386 maxusers 4 @@ -121,8 +121,8 @@ wskbd* at pckbd? mux 1 vga0 at isa? 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 com0 at isa? port 0x3f8 irq 4 # standard PC serial ports com1 at isa? port 0x2f8 irq 3