summaryrefslogtreecommitdiff
path: root/sys/arch/sgi/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sgi/conf')
-rw-r--r--sys/arch/sgi/conf/GENERIC6
-rw-r--r--sys/arch/sgi/conf/files.sgi7
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC
index 27ec1c40fee..163cae86788 100644
--- a/sys/arch/sgi/conf/GENERIC
+++ b/sys/arch/sgi/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.22 2007/10/18 18:59:29 jsing Exp $
+# $OpenBSD: GENERIC,v 1.23 2007/11/27 15:31:00 jsing Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -47,6 +47,9 @@ cpu* at mainbus0
#crimebus0 at mainbus0
macebus0 at mainbus0 # MACE controller localbus.
+# GBE Framebuffer
+gbe0 at mainbus0 disable
+
# Localbus devices
clock0 at macebus0
mec0 at macebus0 sys 0x18 base 0x00280000 irq 4
@@ -110,6 +113,7 @@ audio* at emu?
#### WS console
#wsdisplay* at vga?
#wskbd* at ukbd? mux 1
+wsdisplay* at gbe?
#### Keyboard and Mouse
pckbd* at mkbc?
diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index 100cc12e849..70dd2fd625d 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sgi,v 1.14 2007/10/18 18:59:29 jsing Exp $
+# $OpenBSD: files.sgi,v 1.15 2007/11/27 15:31:00 jsing Exp $
#
# maxpartitions must be first item in files.${ARCH}
#
@@ -84,6 +84,11 @@ attach clock at macebus with clock_macebus
attach clock at xbowmux with clock_xbowmux
file arch/sgi/sgi/clock_md.c clock
+# GBE framebuffer
+device gbe: wsemuldisplaydev, rasops8, rasops16, rasops32
+attach gbe at mainbus
+file arch/sgi/dev/gbe.c gbe
+
# 16[45]50-based "com" ports on localbus
attach com at xbowmux with com_xbow
attach com at macebus with com_localbus