summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64/conf
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2009-07-05 17:13:26 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2009-07-05 17:13:26 +0000
commit43f135881c40fa6943497a30e9cabadf1bfc3bb4 (patch)
tree5ca3dbcc4873b460a7995edbef4f82e0bfc6f41b /sys/arch/sparc64/conf
parent8d9366c7243ef541871aa5ebc659b5a1ec80af2e (diff)
radeonfb(4), an accelerated framebuffer for Sun XVR-100 boards (which have an
ATI Radeon 7000 chip on them). While there, make gfxp(4) depend on rasops32 just in case somebody removes other framebuffers that pull this in from their kernel config. ok deraadt@, miod@
Diffstat (limited to 'sys/arch/sparc64/conf')
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
-rw-r--r--sys/arch/sparc64/conf/RAMDISK4
-rw-r--r--sys/arch/sparc64/conf/files.sparc648
3 files changed, 12 insertions, 4 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 3c9b6cecc21..cb9c6e7c784 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.240 2009/06/24 11:38:40 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.241 2009/07/05 17:13:25 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -485,6 +485,8 @@ machfb* at pci? # PGX/PGX64 framebuffers
wsdisplay* at machfb?
mgx* at sbus? # SMS MGX/MGXPlus framebuffer
wsdisplay* at mgx?
+radeonfb* at pci? # XVR-100 framebuffer
+wsdisplay* at radeonfb?
raptor* at pci? # Raptor framebuffer
wsdisplay* at raptor?
rfx* at sbus? # RasterFlex framebuffer series
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 9b1d246b212..b6c9eb05e89 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.92 2009/06/24 15:02:18 todd Exp $
+# $OpenBSD: RAMDISK,v 1.93 2009/07/05 17:13:25 kettenis Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -293,6 +293,8 @@ machfb* at pci? # PGX/PGX64 framebuffers
wsdisplay* at machfb?
mgx* at sbus? # SMS MGX/MGXPlus framebuffer
wsdisplay* at mgx?
+radeonfb* at pci? # XVR-100 framebuffer
+wsdisplay* at radeonfb?
raptor* at pci? # Raptor framebuffer
wsdisplay* at raptor?
rfx* at sbus? # RasterFlex framebuffer series
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index f70f55631e1..ac70dfdf778 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc64,v 1.125 2009/06/03 23:45:15 kettenis Exp $
+# $OpenBSD: files.sparc64,v 1.126 2009/07/05 17:13:25 kettenis Exp $
# $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -140,6 +140,10 @@ device machfb: wsemuldisplaydev, rasops_bswap, rasops8
attach machfb at pci
file arch/sparc64/dev/machfb.c machfb
+device radeonfb: wsemuldisplaydev, rasops_bswap, rasops8, rasops32
+attach radeonfb at pci
+file arch/sparc64/dev/radeonfb.c radeonfb
+
device ifb: ifb_ident, wsemuldisplaydev, rasops_bswap, rasops8
attach ifb at pci
file arch/sparc64/dev/ifb.c ifb
@@ -148,7 +152,7 @@ device raptor: wsemuldisplaydev, rasops_bswap, rasops8
attach raptor at pci
file arch/sparc64/dev/raptor.c raptor
-device gfxp: wsemuldisplaydev, rasops_bswap, rasops8
+device gfxp: wsemuldisplaydev, rasops_bswap, rasops8, rasops32
attach gfxp at pci
file arch/sparc64/dev/gfxp.c gfxp