The "powerpc" port which has supported the newer Apple Macintosh powerpc based

is being renamed to macppc. This is to allow sharing of common code
between different powerpc base platforms.

Most of the work involved in the renaming process was performed by miod@

Files moved from powerpc/conf to macppc/conf

files.powerpc was modified to keep powerpc common files.

1 files changed, 153 insertions, 0 deletions

diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
new file mode 100644
index 00000000000..87ec005ca70
--- /dev/null
+++ b/sys/arch/macppc/conf/GENERIC
@@ -0,0 +1,153 @@
+#	$OpenBSD: GENERIC,v 1.1 2001/09/01 15:59:31 drahn Exp $
+#
+# PPC GENERIC config file
+#
+
+machine		macppc powerpc
+
+maxusers	32
+
+# default type, instructs system to try to determin what proper type is
+# actual machine type probed via name of openfirmware root node.
+option		SYS_TYPE=APPL
+
+option		FIREPOWERBUGS
+option		PPC_MPC106_BUG
+option		PCIVERBOSE
+option		USBVERBOSE
+#option		MACOBIOVERBOSE
+option		WSEMUL_NO_DUMB
+
+option		USER_PCICONF	# user-space PCI configuration
+
+include "../../../conf/GENERIC"
+
+config		bsd	swap generic
+
+#
+#  Now the Machine specification
+#
+mainbus0	at root
+cpu*		at mainbus0
+
+mpcpcibr*	at mainbus0			# MPC106 PCI Bridge.
+memc*		at mainbus0
+pchb*		at pci?
+
+#### PCI Bus devices.
+
+pci*		at mpcpcibr?
+ppb*		at pci? dev ? function ?	# PCI-PCI bridges
+pci*		at ppb? bus ?
+
+siop*		at pci? dev ? function ?
+fxp*		at pci? dev ? function ?
+de*		at pci? dev ? function ?
+#vme*		at pci? dev ? function ?
+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
+#ami*		at pci? dev ? function ?
+#pcscp*		at pci? dev ? function ?	# AMD Am53c974 PCscsi-PCI SCSI
+pciide*		at pci? dev ? function ?
+macobio0	at pci? dev ? function ?
+gm*		at pci? dev ? function ?	# GMAC ethernet
+an*		at pci? dev ? function ?	# Cisco/Aironet
+iop*		at pci? dev ? function ?	# I2O processor
+ioprbs*		at iop? tid ?			# I2O arrays
+iopsp*		at iop? tid ?			# I2O SCSI pass-through
+
+exphy*		at mii? phy ?			# 3Com internal PHYs
+inphy*		at mii? phy ?			# Intel 82555 PHYs
+iophy*		at mii? phy ?			# Intel 82553 PHYs
+icsphy*		at mii? phy ?			# ICS1890 PHYs
+#lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
+nsphy*		at mii? phy ?			# NS83840 PHYs
+#nsphyter*	at mii? phy ?			# NS83843 PHYs
+#qsphy*		at mii? phy ?			# Quality Semi QS6612 PHYs
+sqphy*		at mii? phy ?			# Seeq 8022[013] PHYs
+#tlphy*		at mii? phy ?			# ThunderLAN PHYs
+#tqphy*		at mii? phy ?			# TDK Semiconductor PHYs
+brgphy*		at mii? phy ?			# Broadcom 10/100/1000 PHYs 
+bmtphy*		at mii? phy ?			# Broadcom 10/100 PHYs 
+ukphy*		at mii? phy ?			# generic unknown PHYs
+
+macintr0	at macobio?			# old interrupt controller
+openpic0	at macobio?			# openpic interrupt controller
+bm*		at macobio?			# BMAC ethernet
+#mc*		at macobio?			# MACE ethernet
+#esp*		at macobio? flags 0x00ff	# 53c9x SCSI
+#mesh*		at macobio? flags 0xffff	# MESH SCSI
+#nvram*		at macobio?			# nvram
+adb*		at macobio?			# Apple Desktop Bus
+wi*		at macobio?			# airport
+gpio*		at macobio?			# GPIO, PMU interrupt router.
+gpio*		at gpio?			# GPIO, PMU interrupt router.
+aed*		at adb?				# ADB Event Device
+akbd*		at adb?				# ADB keyboard
+
+wskbd*		at akbd? console ?
+ams*		at adb?				# ADB mouse
+wsmouse*	at ams?			
+abtn*		at adb?				# ADB button?
+#zsc*		at macobio?
+#zstty*		at zsc? channel ?
+
+awacs*		at macobio?			# Apple audio device
+audio*		at awacs?
+
+#scsibus*	at adv?
+#scsibus*	at ahc?
+#scsibus*	at ami?
+#scsibus*	at bha?
+#scsibus*	at esp?
+#scsibus*	at mesh?
+scsibus*	at ioprbs?
+scsibus*	at iopsp?
+#scsibus*	at pcscp?
+scsibus*	at siop?
+
+wdc*		at macobio? flags 0x0
+wd*		at wdc? drive ? flags 0x0000
+wd*		at pciide? drive ? flags 0x0000
+atapiscsi*	at wdc? channel ? flags 0x0000
+atapiscsi*	at pciide? channel ? flags 0x0000
+scsibus*	at atapiscsi?
+
+# PCI USB Controllers
+ohci*		at pci?				# Open Host Controller
+
+# USB bus support
+usb*		at ohci? flags 0x1
+uhub*		at usb?
+uhub*		at uhub? port ? configuration ? interface ?
+
+uhid*		at uhub? port ? configuration ?	# USB Generic HID devices
+ukbd*		at uhub? port ? configuration ?	# USB HID Keyboard devices
+ums*		at uhub? port ? configuration ?	# USB Mice
+wsmouse*	at ums? mux 0
+ulpt*		at uhub? port ? configuration ?	# USB Printer
+uscanner*	at uhub? port ?			# USB Scanner driver
+usscanner*	at uhub? port ?			# USB SCSI scanners
+scsibus*	at usscanner?
+#uyap*		at uhub? port ?			# Y@P firmware loader
+ugen*		at uhub? port ? configuration ? # USB Generic driver
+umass*		at uhub? port ? configuration ? # USB Mass Storage devices
+scsibus*	at umass?
+kue*		at uhub? port ?			# Kawasaki KL5KUSB101B
+aue*		at uhub? port ?			# USB EtherNet 
+
+wsdisplay*	at vgafb?
+wskbd*		at ukbd? console ?
+
+sd*		at scsibus? target ? lun ?
+st*		at scsibus? target ? lun ?
+cd*		at scsibus? target ? lun ?
+ch*		at scsibus? target ? lun ?
+ss*		at scsibus? target ? lun ?
+uk*		at scsibus? target ? lun ?
+
+#pseudo-device        wsmux	2	# mouse & keyboard multiplexor