Update to use vga console, USB keyboard, adb for reset/poweroff.

2 files changed, 37 insertions, 51 deletions

diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 2e02bff39a2..fe0f3e2c511 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.15 2000/08/08 01:45:08 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.16 2000/09/06 03:57:23 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -28,8 +28,6 @@ cpu*		at mainbus0
 ofroot*		at mainbus0
 mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
 pchb*		at pci?		# host bridge identifiers
-#isabr*		at pci?		# ISA dev bridge.
-#isabr*		at mainbus0	# ISA dev bridge.
 
 #### PCI Bus devices.
 
@@ -41,17 +39,14 @@ ncr*		at pci? dev ? function ?
 fxp*		at pci? dev ? function ?
 de*		at pci? dev ? function ?
 #vme*		at pci? dev ? function ?
-#vga*		at pci? dev ? function ?	# PCI VGA graphics 
-#vgafb0		at pci? dev ? function ?	# PCI VGA graphics 
+vgafb0		at pci? dev ? function ?	# PCI VGA graphics 
 #ep*		at pci? dev ? function ?	# 3Com 3c59x
 #ne*		at pci? dev ? function ?	# NE2000-compatible Ethernet
 #adv*		at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 #ahc*		at pci? dev ? function ?	# Adaptec 294x, aic78x0 SCSI
 #bha*		at pci? dev ? function ?	# BusLogic 9xx SCSI
 #pcscp*		at pci? dev ? function ?	# AMD Am53c974 PCscsi-PCI SCSI
-#ofb*		at pci? dev ? function ?	# Generic Open Firmware Framebuffer
 #pciide*	at pci? dev ? function ?
-#macofcons0	at pci? dev ? function ?	# OpenFirmware console (for debugging)
 obio0		at pci? dev ? function ?
 gm*		at pci? dev ? function ?	# gmac ethernet  G4 
 
@@ -77,7 +72,7 @@ bm*     at obio?                        # bmac ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
 #mesh*   at obio? flags 0xffff           # MESH SCSI
 #nvram*  at obio?                        # nvram
-#adb*    at obio?                        # Apple Desktop Bus
+adb*    at obio?                        # Apple Desktop Bus
 #aed*    at adb?                         # ADB Event Device
 #akbd*   at adb?                         # ADB keyboard
 #ams*    at adb?                         # ADB mouse
@@ -105,25 +100,27 @@ atapiscsi* at wdc? channel ? flags 0x0000
 # ATAPI<->SCSI
 scsibus* at atapiscsi?
 
-#### ISA Bus devices.
+# PCI USB Controllers
+ohci*	at pci? 	# Open Host Controller
 
-#isa*		at isabr?
+# USB bus support
+usb*	at ohci? flags 0x1
+uhub*	at usb?
+uhub*  at uhub? port ? configuration ? interface ?
 
-#com0		at isa? port 0x3f8 irq 4
-#com1		at isa? port 0x2f8 irq 3
-#com2		at isa? port 0x3e8 irq 1	#addresses for VI board com1
-#com3		at isa? port 0x2e8 irq 5	#addresses for VI board com0
+# USB Generic HID devices
+uhid*  at uhub? port ? configuration ? interface ?
 
-#pckbc0		at isa?			# PC prog. periph. interface
-#pckbd0		at pckbc?			# PC keyboard (kbd port)
-#pms0		at pckbc?			# PS/2-style mouse (aux port)
+# USB HID Keyboard devices
+ukbd*  at uhub? port ? configuration ? interface ?
 
-#vga0		at isa?			# ISA VGA
+# USB Generic driver
+ugen*  at uhub? port ? configuration ? interface ?
 
 #### Workstation Console attachments
 
-#wscons*		at vga?
-#wscons*		at vgafb?
+wsdisplay*	at vgafb?
+wskbd0		at ukbd? console 1
 
 #### SCSI Bus devices
  
diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
index 51680d3ebcd..958b553797f 100644
--- a/sys/arch/powerpc/conf/RAMDISK
+++ b/sys/arch/powerpc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.6 2000/08/08 01:45:09 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.7 2000/09/06 03:57:23 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -45,8 +45,6 @@ cpu*		at mainbus0
 ofroot*		at mainbus0
 mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
 pchb*		at pci?		# host bridge identifiers
-#isabr*		at pci?		# ISA dev bridge.
-#isabr*		at mainbus0	# ISA dev bridge.
 
 #### PCI Bus devices.
 
@@ -56,18 +54,14 @@ ppb*		at pci? dev ? function ?	# PCI-PCI bridges
 
 ncr*		at pci? dev ? function ?
 de*		at pci? dev ? function ?
-#vme*		at pci? dev ? function ?
-#vga*		at pci? dev ? function ?	# PCI VGA graphics 
-#vgafb0		at pci? dev ? function ?	# PCI VGA graphics 
+vgafb0		at pci? dev ? function ?	# PCI VGA graphics 
 #ep*		at pci? dev ? function ?        # 3Com 3c59x
 #ne*		at pci? dev ? function ?        # NE2000-compatible Ethernet
 #adv*	at pci? dev ? function ?        # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 #ahc*		at pci? dev ? function ?        # Adaptec 294x, aic78x0 SCSI
 #bha*		at pci? dev ? function ?        # BusLogic 9xx SCSI
 #pcscp*		at pci? dev ? function ?        # AMD Am53c974 PCscsi-PCI SCSI
-#ofb*	at pci? dev ? function ?        # Generic Open Firmware Framebuffer
 #pciide*		at pci? dev ? function ?
-#macofcons0 at pci? dev ? function ?    # OpenFirmware console (for debugging)
 obio0   at pci? dev ? function ?
 gm*     at pci? dev ? function ?       		# gmac ethernet  G4 
 
@@ -85,14 +79,6 @@ sqphy*  at mii? phy ?                   # Seeq 80220/80221/80223 PHYs
 #tqphy*  at mii? phy ?                   # TDK Semiconductor PHYs
 ukphy*  at mii? phy ?                   # generic unknown PHYs
 
-# PCI USB Controllers
-#uhci*	at pci?				# Universal Host Controller (Intel)
-#ohci*	at pci?				# Open Host Controller
-
-# USB bus support
-#usb*	at uhci?
-#usb*	at ohci?
-
 macintr0 at obio?                        # old interrupt controller
 openpic0 at obio?                        # openpic interrupt controller
 bm*     at obio?                        # bmac ethernet
@@ -100,14 +86,13 @@ bm*     at obio?                        # bmac ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
 #mesh*   at obio? flags 0xffff           # MESH SCSI
 #nvram*  at obio?                        # nvram
-#adb*    at obio?                        # Apple Desktop Bus
+adb*    at obio?                        # Apple Desktop Bus
 #aed*    at adb?                         # ADB Event Device
 #akbd*   at adb?                         # ADB keyboard
 #ams*    at adb?                         # ADB mouse
 #zsc*    at obio?
 #zstty*  at zsc? channel ?
 
-
 #### SCSI attachment points
 
 scsibus*	at ncr?
@@ -118,7 +103,6 @@ scsibus*	at ncr?
 #scsibus*	at mesh?
 #scsibus*	at pcscp?
 
-
 wdc*	at obio? flags 0x0
 #wd*     at pciide? channel ? drive ?
 #wd*     at wdc? channel ? drive ? flags 0x0000
@@ -130,25 +114,30 @@ atapiscsi* at wdc? channel ? flags 0x0000
 scsibus* at atapiscsi?
 
 
-#### ISA Bus devices.
+# PCI USB Controllers
+#uhci*	at pci?				# Universal Host Controller (Intel)
+ohci*	at pci?				# Open Host Controller
+
+# USB bus support
+#usb*	at uhci?
+usb*	at ohci?	flags 0x1
+uhub*	at usb?
+uhub*  at uhub? port ? configuration ? interface ?
 
-#isa*		at isabr?
+# USB Generic HID devices
+uhid*  at uhub? port ? configuration ? interface ?
 
-#com0		at isa? port 0x3f8 irq 4
-#com1		at isa? port 0x2f8 irq 3
-#com2		at isa? port 0x3e8 irq 1	#addresses for VI board com1
-#com3		at isa? port 0x2e8 irq 5	#addresses for VI board com0
+# USB HID Keyboard devices
+ukbd*  at uhub? port ? configuration ? interface ?
 
-#pckbc0		at isa?			# PC prog. periph. interface
-#pckbd0		at pckbc?			# PC keyboard (kbd port)
-#pms0		at pckbc?			# PS/2-style mouse (aux port)
+# USB Generic driver
+ugen*  at uhub? port ? configuration ? interface ?
 
-#vga0		at isa?			# ISA VGA
 
 #### Workstation Console attachments
 
-#wscons*		at vga?
-#wscons*		at vgafb?
+wsdisplay*	at vgafb?
+wskbd0		at ukbd? console 1
 
 #### SCSI Bus devices