summaryrefslogtreecommitdiff
path: root/sys/arch/powerpc/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/powerpc/conf')
-rw-r--r--sys/arch/powerpc/conf/GENERIC153
-rw-r--r--sys/arch/powerpc/conf/GENERIC-NONMAC79
-rw-r--r--sys/arch/powerpc/conf/Makefile.powerpc198
-rw-r--r--sys/arch/powerpc/conf/RAMDISK162
-rw-r--r--sys/arch/powerpc/conf/RAMDISK-NONMAC105
-rw-r--r--sys/arch/powerpc/conf/files.powerpc242
6 files changed, 2 insertions, 937 deletions
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
deleted file mode 100644
index 301ce61f210..00000000000
--- a/sys/arch/powerpc/conf/GENERIC
+++ /dev/null
@@ -1,153 +0,0 @@
-# $OpenBSD: GENERIC,v 1.45 2001/07/09 06:44:11 mickey Exp $
-#
-# PPC GENERIC config file
-#
-
-machine 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
diff --git a/sys/arch/powerpc/conf/GENERIC-NONMAC b/sys/arch/powerpc/conf/GENERIC-NONMAC
deleted file mode 100644
index 0cfddcf16f2..00000000000
--- a/sys/arch/powerpc/conf/GENERIC-NONMAC
+++ /dev/null
@@ -1,79 +0,0 @@
-# $OpenBSD: GENERIC-NONMAC,v 1.2 2001/03/08 03:37:19 itojun Exp $
-#
-# PPC GENERIC config file
-#
-
-machine 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=OFWMACH
-
-option FIREPOWERBUGS
-options PPC_MPC106_BUG
-
-include "../../../conf/GENERIC"
-
-config bsd swap generic
-
-
-#
-# Now the Machine specification
-#
-mainbus0 at root
-cpu* at mainbus0
-
-ofroot* at mainbus0
-mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
-isabr* at pci? # ISA dev bridge.
-mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
-isabr* at mainbus0 # ISA dev bridge.
-
-#### PCI Bus devices.
-
-pci* at mpcpcibr?
-ncr* at pci? dev ? function ?
-scsibus* at ncr?
-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
-
-#### ISA Bus devices.
-
-isa* at isabr?
-
-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
-
-pckbc0 at isa? # PC prog. periph. interface
-pckbd0 at pckbc? # PC keyboard (kbd port)
-pms0 at pckbc? # PS/2-style mouse (aux port)
-
-vga0 at isa? # ISA VGA
-
-#### Workstation Console attachments
-
-wscons* at vga?
-wscons* at vgafb?
-
-#### SCSI Bus devices
-
-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 ?
-
-#### openfirmware devices
-# mostly unused currently
-ofbus* at openfirm?
-ofrtc* at openfirm?
-ofdisk* at openfirm? # used for floppy support
-#ofnet* at openfirm?
-#ofcons* at openfirm?
diff --git a/sys/arch/powerpc/conf/Makefile.powerpc b/sys/arch/powerpc/conf/Makefile.powerpc
deleted file mode 100644
index 069c6612661..00000000000
--- a/sys/arch/powerpc/conf/Makefile.powerpc
+++ /dev/null
@@ -1,198 +0,0 @@
-# $OpenBSD: Makefile.powerpc,v 1.12 2001/07/18 23:56:32 mickey Exp $
-#
-# Makefile for OpenBSD PowerPC
-#
-# This makefile is constructed from a machine description:
-# config machineid
-# Most changes should be made in the machine description
-# /sys/arch/powerpc/conf/``machineid''
-# after which you should do
-# config machineid
-# Machine generic makefile changes should be made in
-# /sys/arch/powerpc/conf/Makefile.powerpc
-# after which config should be rerun for all machines of that type.
-#
-# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
-# IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
-#
-# -DTRACE compile in kernel tracing hooks
-# -DQUOTA compile in file system quotas
-#
-.SUFFIXES: .S .c .o
-
-# DEBUG is set to -g if debugging.
-# PROF is set to -pg if profiling.
-
-.include <bsd.own.mk>
-
-AS?= as
-CC?= cc
-CPP?= cpp
-LD?= ld
-MKDEP?= mkdep
-STRIP?= strip
-SIZE?= size
-
-# source tree is located via $S relative to the compilation directory
-.ifndef S
-S!= cd ../../../..; pwd
-.endif
-PPC= $S/arch/powerpc
-
-INCLUDES= -I. -I$S/arch -I$S -nostdinc -L${DESTDIR}/usr/include
-CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \
- -Dpowerpc
-CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wno-uninitialized -Wno-format -Wno-main
-CFLAGS= ${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
-AFLAGS= -D_LOCORE
-LINKFLAGS= -N -Ttext 100074 -e start
-STRIPFLAGS= -d
-
-HOSTCC?= ${CC}
-HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
-HOSTED_CFLAGS= ${CFLAGS}
-
-### find out what to use for libkern
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN= ${KERNLIB}
-.else
-LIBKERN= ${KERNLIB_PROF}
-.endif
-
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-LIBCOMPAT= ${COMPATLIB}
-.else
-LIBCOMPAT= ${COMPATLIB_PROF}
-.endif
-
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
-
-USRLAND_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-USRLAND_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C= ${AS} ${COPTS} ${PARAM} $< -o $@
-
-
-%OBJS
-
-%CFILES
-
-%SFILES
-
-# load lines for config "xxx" will be emitted as:
-# xxx: ${SYSTEM_DEP} swapxxx.o
-# ${SYSTEM_LD_HEAD}
-# ${SYSTEM_LD} swapxxx.o
-# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
-SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD= rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
-
-DEBUG?=
-.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-SYSTEM_LD_TAIL+=; \
- echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
- echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
-.else
-LINKFLAGS+= -S
-.endif
-
-%LOAD
-
-assym.h: $S/kern/genassym.sh ${PPC}/powerpc/genassym.cf
- sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
- < ${PPC}/powerpc/genassym.cf > assym.h.tmp && \
- mv -f assym.h.tmp assym.h
-
-param.c: $S/conf/param.c
- rm -f param.c
- cp $S/conf/param.c .
-
-param.o: param.c Makefile
- ${NORMAL_C_C}
-
-ioconf.o: ioconf.c
- ${NORMAL_C}
-
-newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
- sh $S/conf/newvers.sh
- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
-
-clean::
- rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
- [Ee]rrs linterrs makelinks genassym genassym.o assym.h
-
-lint:
- @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
- ${PPC}/powerpc/Locore.c ${CFILES} ${PPC}/powerpc/swapgeneric.c \
- ioconf.c param.c | \
- grep -v 'static function .* unused'
-
-tags:
- @echo "see $S/kern/Makefile for tags"
-
-links:
- egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
- sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
- echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
- sort -u | comm -23 - dontlink | \
- sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
- sh makelinks && rm -f dontlink
-
-SRCS= ${PPC}/powerpc/locore.S \
- param.c ioconf.c ${CFILES} ${SFILES}
-depend:: .depend
-.depend: ${SRCS} assym.h param.c
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${PPC}/powerpc/locore.S
- ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-.if ${SFILES} != ""
- ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-.endif
-
-# depend on root or device configuration
-autoconf.o conf.o: Makefile
-
-# depend on network or filesystem configuration
-uipc_proto.o vfs_conf.o: Makefile
-
-# depend on maxusers
-genassym.o machdep.o: Makefile
-
-# depend on CPU configuration
-locore.o machdep.o: Makefile
-
-
-locore.o: ${PPC}/powerpc/locore.S assym.h
- ${NORMAL_S}
-
-# The install target can be redefined by putting a
-# install-kernel-${MACHINE_NAME} target into /etc/mk.conf
-MACHINE_NAME!= uname -n
-install: install-kernel-${MACHINE_NAME}
-.if !target(install-kernel-${MACHINE_NAME}})
-install-kernel-${MACHINE_NAME}:
- rm -f /obsd
- ln /bsd /obsd
- cp bsd /nbsd
- mv /nbsd /bsd
-.endif
-
-%RULES
diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
deleted file mode 100644
index bac56d05e27..00000000000
--- a/sys/arch/powerpc/conf/RAMDISK
+++ /dev/null
@@ -1,162 +0,0 @@
-# $OpenBSD: RAMDISK,v 1.27 2001/06/27 07:32:52 drahn Exp $
-#
-# PPC GENERIC config file
-#
-
-machine 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 WSEMUL_NO_DUMB
-
-# include "../../../conf/GENERIC"
-option TIMEZONE=0 # time zone to adjust RTC time by
-option DST=0 # daylight saving time used by RTC
-option SWAPPAGER # paging; REQUIRED
-option DEVPAGER # mmap() of devices
-option COMPAT_43 # and 4.3BSD
-option FFS # UFS
-option MFS # memory file system
-option CD9660 # ISO 9660 + Rock Ridge file system
-option MSDOSFS # MS-DOS file system
-option INET # IP + ICMP + TCP + UDP
-option DDB # IP + ICMP + TCP + UDP
-
-config bsd root on rd0a swap on rd0b
-
-
-#
-# Now the Machine specification
-#
-mainbus0 at root
-cpu* at mainbus0
-
-mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
-memc* at mainbus0
-pchb* at pci? # host bridge identifiers
-
-#### PCI Bus devices.
-
-pci* at mpcpcibr?
-ppb* at pci? dev ? function ? # PCI-PCI bridges
-pci* at ppb? bus ?
-
-siop* at pci? dev ? function ?
-#ncr* 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
-#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 802.11DS
-
-# how many of these are needed?
-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 ? # Integrated Circuit Systems ICS1890
-#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 Semiconductor QS6612 PHYs
-sqphy* at mii? phy ? # Seeq 80220/80221/80223 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? # Apple Airport 802.11DS
-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 ?
-
-scsibus* at siop?
-#scsibus* at ncr?
-#scsibus* at adv?
-#scsibus* at ahc?
-#scsibus* at bha?
-#scsibus* at esp?
-#scsibus* at mesh?
-#scsibus* at pcscp?
-
-wdc* at macobio? flags 0x0
-wd* at wdc? drive ? flags 0x0000
-wd* at pciide? channel ? drive ?
-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 loop 1 # network loopback
-pseudo-device pty 64 # pseudo-terminals
-#pseudo-device ccd 4 # concatenated disk devices
-#pseudo-device ksyms 1 # kernel symbols device
-pseudo-device bpfilter 1 # packet filter
-pseudo-device rd 1 # ram disk
-
-# RAMDISK stuff
-option MINIROOTSIZE=8192
-option RAMDISK_HOOKS
diff --git a/sys/arch/powerpc/conf/RAMDISK-NONMAC b/sys/arch/powerpc/conf/RAMDISK-NONMAC
deleted file mode 100644
index a97ba944b6b..00000000000
--- a/sys/arch/powerpc/conf/RAMDISK-NONMAC
+++ /dev/null
@@ -1,105 +0,0 @@
-# $OpenBSD: RAMDISK-NONMAC,v 1.3 2001/07/04 08:38:48 niklas Exp $
-
-#
-# RAMDISK install kernel definition.
-#
-
-machine powerpc
-
-maxusers 8
-
-# Standard system options
-option SWAPPAGER
-option DEVPAGER
-
-# 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=OFWMACH
-
-option FIREPOWERBUGS
-options PPC_MPC106_BUG
-
-#options KTRACE
-#options DEBUG
-
-option NFSCLIENT
-#option NFSSERVER
-
-option CD9660
-option MSDOSFS
-options FIFO
-option FFS
-#option QUOTA
-option MFS
-
-options INET
-
-# Specify storage configuration using ramdisk
-config bsd root on rd0a swap on rd0b
-
-#
-# Now the Machine specification
-#
-mainbus0 at root
-cpu* at mainbus0
-
-ofroot* at mainbus0
-mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
-isabr* at pci? # ISA dev bridge.
-mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
-isabr* at mainbus0 # ISA dev bridge.
-
-#### PCI Bus devices.
-
-pci* at mpcpcibr?
-ncr* at pci? dev ? function ?
-scsibus* at ncr?
-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
-
-#### ISA Bus devices.
-
-isa* at isabr?
-
-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
-
-#### SCSI Bus devices
-
-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 ?
-
-#### openfirmware devices
-# mostly unused currently
-ofbus* at openfirm?
-ofrtc* at openfirm?
-#ofdisk* at openfirm? # used for floppy support
-#ofnet* at openfirm?
-#ofcons* at openfirm?
-
-#### PSEUDO Devices
-
-pseudo-device loop 1 # network loopback
-#pseudo-device bpfilter 8 # packet filter ports
-#pseudo-device sl 2 # serial-line IP ports
-pseudo-device ppp 1 # serial-line PPP ports
-#pseudo-device tun 2 # network tunneling over tty
-
-#pseudo-device pty 64 # pseudo ptys
-#pseudo-device random 1
-#pseudo-device vnd 4 # paging to files
-#pseudo-device ccd 4 # concatenated disk devices
-pseudo-device rd 1 # ram disk
-
-# RAMDISK stuff
-option MINIROOTSIZE=8192
-option RAMDISK_HOOKS
-
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 9c7adeac1b7..c20b45c8c74 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -1,32 +1,16 @@
-# $OpenBSD: files.powerpc,v 1.33 2001/07/04 08:38:48 niklas Exp $
-
-#
-# powerpc-specific configuration info
+# $OpenBSD: files.powerpc,v 1.34 2001/09/01 15:59:31 drahn Exp $
#
-maxpartitions 16
-
-maxusers 2 8 64
+file arch/powerpc/powerpc/setjmp.S ddb
file arch/powerpc/powerpc/Locore.c
-file arch/powerpc/powerpc/autoconf.c
file arch/powerpc/powerpc/bcopy.c
-file arch/powerpc/powerpc/clock.c
-file arch/powerpc/powerpc/conf.c
file arch/powerpc/powerpc/copyinstr.c
file arch/powerpc/powerpc/copyoutstr.c
file arch/powerpc/powerpc/copystr.c
-file arch/powerpc/powerpc/disksubr.c disk
file arch/powerpc/powerpc/fpu.c
file arch/powerpc/powerpc/fubyte.c
file arch/powerpc/powerpc/fuswintr.c
file arch/powerpc/powerpc/in_cksum.c
-file arch/powerpc/powerpc/ipkdb_glue.c ipkdb
-file arch/powerpc/powerpc/machdep.c
-file arch/powerpc/powerpc/wscons_machdep.c
-file arch/powerpc/powerpc/mem.c
-file arch/powerpc/powerpc/dma.c
-file arch/powerpc/powerpc/ofw_machdep.c
-file arch/powerpc/powerpc/openfirm.c
file arch/powerpc/powerpc/pmap.c
file arch/powerpc/powerpc/process_machdep.c
file arch/powerpc/powerpc/subyte.c
@@ -35,225 +19,3 @@ file arch/powerpc/powerpc/suswintr.c
file arch/powerpc/powerpc/sys_machdep.c
file arch/powerpc/powerpc/trap.c
file arch/powerpc/powerpc/vm_machdep.c
-file dev/cons.c
-file dev/cninit.c
-file arch/powerpc/powerpc/setjmp.S ddb
-file arch/powerpc/powerpc/db_memrw.c ddb
-file arch/powerpc/powerpc/db_disasm.c ddb
-file arch/powerpc/powerpc/db_interface.c ddb
-file arch/powerpc/powerpc/db_trace.c ddb
-file arch/powerpc/powerpc/ofwreal.S
-
-#
-# Media Indepedent Interface (mii)
-#
-include "../../../dev/mii/files.mii"
-
-#
-# MAC generic
-#
-file arch/powerpc/mac/dbdma.c
-
-#
-# Openfirmware support
-#
-
-define mainbus {}
-device mainbus
-attach mainbus at root
-file arch/powerpc/powerpc/mainbus.c mainbus
-
-device cpu
-attach cpu at mainbus
-file arch/powerpc/powerpc/cpu.c
-
-include "../../../dev/ofw/files.ofw"
-file arch/powerpc/powerpc/opendev.c
-major { ofdisk = 4 }
-
-
-device memc {}
-attach memc at mainbus
-file arch/powerpc/mac/uni_n.c memc
-
-major {rd = 17}
-major {sd = 2}
-major {cd = 3}
-
-include "../../../scsi/files.scsi"
-
-#
-# I2O
-#
-include "../../../dev/i2o/files.i2o"
-
-include "dev/pci/files.pci"
-file arch/powerpc/pci/pciide_machdep.c pciide
-
-device mpcpcibr {} : pcibus
-attach mpcpcibr at mainbus
-file arch/powerpc/pci/mpcpcibus.c mpcpcibr
-#file arch/powerpc/pci/pci_addr_fixup.c mpcpcibr
-
-#
-# "workstation console" routines
-#
-
-include "dev/wscons/files.wscons"
-
-
-#device ofb: wsemuldisplaydev, wsrasteremulops
-device ofb
-attach ofb at pci
-file arch/powerpc/mac/ofb.c ofb needs-flag
-
-
-#
-# mac peripheral pieces.
-#
-
-#file arch/powerpc/pci/bandit.c pci
-
-#PCI-Host bridge chipsets
-device pchb
-attach pchb at pci
-file arch/powerpc/pci/pchb.c pchb
-
-
-#
-# Machine-independent ATAPI drivers
-#
-
-include "../../../dev/atapiscsi/files.atapiscsi"
-include "../../../dev/ata/files.ata"
-
-# MAC periph
-
-device macobio {}
-attach macobio at pci
-file arch/powerpc/pci/macobio.c macobio
-
-#device esp: scsi, ncr53c9x
-#attach esp at macobio
-#file arch/powerpc/mac/esp.c esp
-
-device mesh: scsi
-attach mesh at macobio
-file arch/powerpc/mac/mesh.c mesh
-
-device mc: ifnet, ether
-attach mc at macobio
-file arch/powerpc/mac/if_mc.c mc
-file arch/powerpc/mac/am79c950.c mc
-
-device bm: ether, ifnet, ifmedia
-attach bm at macobio
-file arch/powerpc/mac/if_bm.c bm
-
-device gm: ether, ifnet, ifmedia, mii
-attach gm at pci
-file arch/powerpc/mac/if_gm.c gm needs-flag
-
-device macintr {}
-attach macintr at macobio
-file arch/powerpc/mac/macintr.c macintr
-
-device openpic {}
-attach openpic at macobio
-file arch/powerpc/mac/openpic.c openpic
-
-device zsc {channel = -1}
-attach zsc at macobio
-file arch/powerpc/mac/zs.c zsc needs-flag
-file dev/ic/z8530sc.c zsc
-
-device zstty: tty
-attach zstty at zsc
-file dev/ic/z8530tty.c zstty needs-flag
-
-device adb {}
-attach adb at macobio
-file arch/powerpc/mac/adb.c adb needs-flag
-file arch/powerpc/mac/adb_direct.c adb
-file arch/powerpc/mac/pm_direct.c adb
-
-device aed
-attach aed at adb
-file arch/powerpc/mac/aed.c aed needs-flag
-
-#??
-#define wskbddev {[console = -1]}
-#define wsmousedev {}
-#??
-
-device akbd: wskbddev
-attach akbd at adb
-file arch/powerpc/mac/akbd.c akbd needs-flag
-
-device ams: wsmousedev
-attach ams at adb
-file arch/powerpc/mac/ams.c ams
-
-device abtn
-attach abtn at adb
-file arch/powerpc/mac/abtn.c abtn
-
-device awacs: audio, auconv, mulaw
-attach awacs at macobio
-file arch/powerpc/mac/awacs.c awacs
-
-device nvram
-attach nvram at macobio
-file arch/powerpc/mac/nvram.c nvram needs-flag
-
-device gpio {}
-attach gpio at macobio with gpio_obio
-attach gpio at gpio with gpio_gpio
-file arch/powerpc/mac/gpio.c gpio
-
-attach wdc at macobio with wdc_obio
-file arch/powerpc/mac/wdc_obio.c wdc_obio
-
-attach wi at macobio with wi_obio
-file arch/powerpc/mac/if_wi_obio.c wi_obio
-
-define grfdev {}
-
-device grfati: grfdev
-attach grfati at pci
-file arch/powerpc/mac/grf_ati.c grfati needs-flag
-
-device grf {}
-attach grf at grfdev
-file arch/powerpc/mac/grf.c grf needs-flag
-file arch/powerpc/mac/grf_subr.c grf
-
-device ite: tty
-attach ite at grf
-file arch/powerpc/mac/ite.c ite needs-flag
-
-
-# VGA framebuffer
-device vgafb: wsemuldisplaydev, wsrasteremulops
-file arch/powerpc/pci/vgafb.c vgafb & vgafb_pci
-
-# Generic VGA Framebuffer version
-attach vgafb at pci with vgafb_pci
-file arch/powerpc/pci/vgafb_pci.c vgafb_pci needs-flag
-
-
-#
-# CARDBUS
-#
-include "dev/cardbus/files.cardbus"
-#file arch/powerpc/powerpc/rbus_machdep.c cardbus
-
-#
-# Machine-independent PCMCIA drivers
-#
-include "dev/pcmcia/files.pcmcia"
-
-#
-# Machine-independent USB drivers
-#
-include "dev/usb/files.usb"