summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2015-08-31 03:42:52 +0000
committerYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2015-08-31 03:42:52 +0000
commit80e34bc47b3571e2fa1c263a49208de334dd4595 (patch)
tree45910abb73254a9759f8bb184c91cf0009df2e7a
parenta4c7e44b581895df2d4b7cc4f88e39b12a83c740 (diff)
Enable efifb(4).
ok deraadt kettenis
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/amd64/conf/RAMDISK5
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 5feb08e2fbe..5c21b76fa35 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.394 2015/08/30 10:05:09 yasuoka Exp $
+# $OpenBSD: GENERIC,v 1.395 2015/08/31 03:42:51 yasuoka Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -334,8 +334,8 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports
#lpt2 at isa? port 0x3bc
lpt* at puc?
-#efifb0 at mainbus? # EFI Framebuffer
-#wsdisplay0 at efifb? console 1
+efifb0 at mainbus? # EFI Framebuffer
+wsdisplay0 at efifb? console 1
#bha* at pci? # BusLogic [57]4X SCSI controllers
ahc* at pci? # Adaptec 2940 SCSI controllers
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 66a7ec6bb23..6668d822545 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.68 2015/07/17 22:52:28 tedu Exp $
+# $OpenBSD: RAMDISK,v 1.69 2015/08/31 03:42:51 yasuoka Exp $
machine amd64
maxusers 4
@@ -75,6 +75,9 @@ wsdisplay* at vga?
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
+efifb0 at mainbus? # EFI Framebuffer
+wsdisplay0 at efifb? console 1
+
mpi* at pci? # LSI Logic Message Passing Interface
mfi* at pci? # LSI MegaRAID SAS controllers