[src/trunk]: src/sys/arch/ofppc/conf add the normal DKWEDGE* options, and ena...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f7aee829b67
branches:  trunk
changeset: 760306:4f7aee829b67
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jan 02 11:25:31 2011 +0000

description:
add the normal DKWEDGE* options, and enable drvctl.

diffstat:

 sys/arch/ofppc/conf/GENERIC |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r c370f3d61898 -r 4f7aee829b67 sys/arch/ofppc/conf/GENERIC
--- a/sys/arch/ofppc/conf/GENERIC       Sun Jan 02 11:24:20 2011 +0000
+++ b/sys/arch/ofppc/conf/GENERIC       Sun Jan 02 11:25:31 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.134 2010/12/31 21:50:27 phx Exp $
+# $NetBSD: GENERIC,v 1.135 2011/01/02 11:25:31 mrg Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.134 $"
+#ident                 "GENERIC-$Revision: 1.135 $"
 
 maxusers       32
 
@@ -80,6 +80,13 @@
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
 options        COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
 
+# Wedge support
+options        DKWEDGE_AUTODISCOVER    # Automatically add dk(4) instances
+options        DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges
+# The following two options can break /etc/fstab, so handle with care
+#options       DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
+#options       DKWEDGE_METHOD_MBR      # Support MBR partitions as wedges
+
 # File systems
 file-system    FFS             # UFS
 file-system    EXT2FS          # second extended file system (linux)
@@ -445,6 +452,9 @@
 #pseudo-device pflog                   # PF log if
 pseudo-device  putter                  # for puffs and pud
 
+# userland interface to drivers, including autoconf and properties retrieval
+pseudo-device  drvctl
+
 # Veriexec
 #
 # a pseudo device needed for veriexec