From 4f4676e9c0282e601211a9e217d2c32e13d420ab Mon Sep 17 00:00:00 2001
From: tsubai <tsubai@NetBSD.org>
Date: Wed, 14 Oct 1998 13:54:09 +0000
Subject: [PATCH] Sync to ``POWERMAC'' config.

---
 sys/arch/macppc/conf/GENERIC | 14 +++++++++-----
 sys/arch/macppc/conf/INSTALL | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index a8ae3ba85bb6..e3a6505148b7 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.13 1998/10/13 11:25:26 tsubai Exp $
+#	$NetBSD: GENERIC,v 1.14 1998/10/14 13:54:09 tsubai Exp $
 #
 # POWERMAC config file
 #
@@ -87,6 +87,10 @@ options 	NMBCLUSTERS=1024
 options 	PCIVERBOSE	# verbose PCI device autoconfig messages
 options 	SCSIVERBOSE	# human readable SCSI error messages
 
+# wscons options
+#options 	WSEMUL_SUN		# sun terminal emulation
+options 	WSEMUL_VT100		# VT100 / VT220 emulation
+
 # Kernel root file system and dump configuration.
 config		netbsd	root on ? type ?
 
@@ -120,6 +124,10 @@ aed*	at adb?				# ADB Event Device
 akbd*	at adb?				# ADB keyboard
 ams*	at adb?				# ADB mouse
 
+ofb0	at pci? dev ? function ?	# Generic Open Firmware Framebuffer
+wsdisplay* at ofb? console ?
+wskbd*	at akbd? console ?
+
 mc0	at obio0			# MACE ethernet
 esp0	at obio0 flags 0x00ff		# 53c9x SCSI
 scsibus* at esp0
@@ -128,10 +136,6 @@ zsc0	at obio0
 zstty0	at zsc0 channel 0
 zstty1	at zsc0 channel 1
 
-grfati0 at pci? dev ? function ?	# ATY,mach64
-grf0	at grfati0
-ite0	at grf0
-
 sd*	at scsibus? target ? lun ?	# SCSI disks
 st*	at scsibus? target ? lun ?	# SCSI tape drives
 cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
diff --git a/sys/arch/macppc/conf/INSTALL b/sys/arch/macppc/conf/INSTALL
index e34f653748eb..3ce41fd8b266 100644
--- a/sys/arch/macppc/conf/INSTALL
+++ b/sys/arch/macppc/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.1 1998/07/29 05:19:26 tsubai Exp $
+#	$NetBSD: INSTALL,v 1.2 1998/10/14 13:54:09 tsubai Exp $
 #
 # config file for INSTALL FLOPPY
 #
@@ -32,6 +32,7 @@ options 	NMBCLUSTERS=1024
 options 	NFS_BOOT_DHCP, NFS_BOOT_BOOTPARAM
 
 options 	ZS_TXDMA	# Use dma on zs output
+options 	WSEMUL_VT100	# VT100 / VT220 emulation
 
 # Kernel root file system and dump configuration.
 config		netbsd	root on ? type ?
@@ -56,7 +57,16 @@ scsibus* at ahc?
 
 obio0	at pci? dev ? function ?
 nvram0	at obio0			# nvram
+
 adb0	at obio0			# Apple Desktop Bus
+aed*	at adb?				# ADB Event Device
+akbd*	at adb?				# ADB keyboard
+ams*	at adb?				# ADB mouse
+
+ofb0	at pci? dev ? function ?	# Generic Open Firmware Framebuffer
+wsdisplay* at ofb? console ?
+wskbd*	at akbd? console ?
+
 mc0	at obio0			# MACE ethernet
 esp0	at obio0 flags 0x00ff		# 53c9x SCSI
 scsibus0 at esp0
@@ -65,10 +75,6 @@ zsc0	at obio0
 zstty0	at zsc0 channel 0
 zstty1	at zsc0 channel 1
 
-grfati0	at pci? dev ? function ?
-grf0	at grfati0
-ite0	at grf0
-
 sd*	at scsibus? target ? lun ?	# SCSI disks
 st*	at scsibus? target ? lun ?	# SCSI tape drives
 cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives