summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/powerpc/conf/GENERIC110
-rw-r--r--sys/arch/powerpc/conf/GENERIC-NONMAC83
-rw-r--r--sys/arch/powerpc/conf/GENERICMAC145
-rw-r--r--sys/arch/powerpc/conf/RAMDISK162
-rw-r--r--sys/arch/powerpc/conf/RAMDISK-NONMAC104
-rw-r--r--sys/arch/powerpc/conf/RAMDISKMAC174
6 files changed, 389 insertions, 389 deletions
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index d49116a0cfd..95f8f78cf39 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.13 2000/08/07 18:51:22 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.14 2000/08/08 01:07:51 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -9,10 +9,12 @@ 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 SYS_TYPE=APPL
option FIREPOWERBUGS
options PPC_MPC106_BUG
+option IPX # IPX+SPX
+option IPXIP # IPX tunneling over IP
include "../../../conf/GENERIC"
@@ -27,39 +29,102 @@ 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.
+pchb* at pci? # host bridge identifiers
+#isabr* at pci? # ISA dev bridge.
+#isabr* at mainbus0 # ISA dev bridge.
#### PCI Bus devices.
pci* at mpcpcibr?
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+pci* at ppb? bus ?
+
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
+#vga* 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
+
+# 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
+ukphy* at mii? phy ? # generic unknown PHYs
+
+
+macintr0 at obio? # old interrupt controller
+openpic0 at obio? # openpic interrupt controller
+bm* at obio? # bmac ethernet
+#mc* at obio? # MACE 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
+#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?
+#scsibus* at adv?
+#scsibus* at ahc?
+#scsibus* at bha?
+#scsibus* at esp?
+#scsibus* at mesh?
+#scsibus* at pcscp?
+
+wdc* at obio? flags 0x0
+#wd* at pciide? channel ? drive ?
+#wd* at wdc? channel ? drive ? flags 0x0000
+wd* at wdc? drive ? flags 0x0000
+
+atapiscsi* at wdc? channel ? flags 0x0000
+
+# ATAPI<->SCSI
+scsibus* at atapiscsi?
#### ISA Bus devices.
-isa* at isabr?
+#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
+#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)
+#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
+#vga0 at isa? # ISA VGA
#### Workstation Console attachments
-wscons* at vga?
-wscons* at vgafb?
+#wscons* at vga?
+#wscons* at vgafb?
#### SCSI Bus devices
@@ -74,10 +139,7 @@ uk* at scsibus? target ? lun ?
# mostly unused currently
ofbus* at openfirm?
ofrtc* at openfirm?
-ofdisk* at openfirm? # used for floppy support
+#ofdisk* at openfirm? # used for floppy support
#ofnet* at openfirm?
-#ofcons* at openfirm?
+ofcons* at openfirm?
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1
diff --git a/sys/arch/powerpc/conf/GENERIC-NONMAC b/sys/arch/powerpc/conf/GENERIC-NONMAC
new file mode 100644
index 00000000000..4e72f7d153e
--- /dev/null
+++ b/sys/arch/powerpc/conf/GENERIC-NONMAC
@@ -0,0 +1,83 @@
+# $OpenBSD: GENERIC-NONMAC,v 1.1 2000/08/08 01:07:52 deraadt 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?
+
+# for IPv6
+pseudo-device gif 4
+#pseudo-device faith 1
diff --git a/sys/arch/powerpc/conf/GENERICMAC b/sys/arch/powerpc/conf/GENERICMAC
deleted file mode 100644
index 505dd0d18c4..00000000000
--- a/sys/arch/powerpc/conf/GENERICMAC
+++ /dev/null
@@ -1,145 +0,0 @@
-# $OpenBSD: GENERICMAC,v 1.8 2000/03/31 04:44:39 rahnds 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
-options PPC_MPC106_BUG
-option IPX # IPX+SPX
-option IPXIP # IPX tunneling over IP
-
-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.
-pchb* at pci? # host bridge identifiers
-#isabr* at pci? # ISA dev bridge.
-#isabr* at mainbus0 # ISA dev bridge.
-
-#### PCI Bus devices.
-
-pci* at mpcpcibr?
-ppb* at pci? dev ? function ? # PCI-PCI bridges
-pci* at ppb? bus ?
-
-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
-#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
-
-# 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
-ukphy* at mii? phy ? # generic unknown PHYs
-
-
-macintr0 at obio? # old interrupt controller
-openpic0 at obio? # openpic interrupt controller
-bm* at obio? # bmac ethernet
-#mc* at obio? # MACE 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
-#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?
-#scsibus* at adv?
-#scsibus* at ahc?
-#scsibus* at bha?
-#scsibus* at esp?
-#scsibus* at mesh?
-#scsibus* at pcscp?
-
-wdc* at obio? flags 0x0
-#wd* at pciide? channel ? drive ?
-#wd* at wdc? channel ? drive ? flags 0x0000
-wd* at wdc? drive ? flags 0x0000
-
-atapiscsi* at wdc? channel ? flags 0x0000
-
-# ATAPI<->SCSI
-scsibus* at atapiscsi?
-
-#### 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/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
index 2ae542a6c35..04a965ed4f9 100644
--- a/sys/arch/powerpc/conf/RAMDISK
+++ b/sys/arch/powerpc/conf/RAMDISK
@@ -1,41 +1,40 @@
+# $OpenBSD: RAMDISK,v 1.5 2000/08/08 01:07:52 deraadt Exp $
#
-# RAMDISK install kernel definition.
+# PPC GENERIC config file
#
machine powerpc
-maxusers 8
-
-# Standard system options
-option SWAPPAGER
-option DEVPAGER
+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 SYS_TYPE=APPL
option FIREPOWERBUGS
options PPC_MPC106_BUG
-#options KTRACE
-#options DEBUG
-
-option NFSCLIENT
-#option NFSSERVER
-
-option CD9660
-option MSDOSFS
-options FIFO
-options KERNFS
-option FFS
-#option QUOTA
-option MFS
+# include "../../../conf/GENERIC"
+option TIMEZONE=0 # time zone to adjust RTC time by
+option DST=0 # daylight savings 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 KERNFS # /kern
+option INET # IP + ICMP + TCP + UDP
+option DDB # IP + ICMP + TCP + UDP
+pseudo-device loop 2 # network loopback
+pseudo-device pty 64 # pseudo-terminals
+#pseudo-device ccd 4 # concatenated disk devices
+#pseudo-device ksyms 1 # kernel symbols device
-options INET
-
-# Specify storage configuration using ramdisk
config bsd root on rd0a swap on rd0b
+
#
# Now the Machine specification
#
@@ -44,28 +43,111 @@ 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.
+pchb* at pci? # host bridge identifiers
+#isabr* at pci? # ISA dev bridge.
+#isabr* at mainbus0 # ISA dev bridge.
#### PCI Bus devices.
pci* at mpcpcibr?
+pci* at ppb? bus ?
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+
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
+#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
+
+# 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
+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
+#mc* at obio? # MACE 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
+#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?
+#scsibus* at adv?
+#scsibus* at ahc?
+#scsibus* at bha?
+#scsibus* at esp?
+#scsibus* at mesh?
+#scsibus* at pcscp?
+
+
+wdc* at obio? flags 0x0
+#wd* at pciide? channel ? drive ?
+#wd* at wdc? channel ? drive ? flags 0x0000
+wd* at wdc? drive ? flags 0x0000
+
+atapiscsi* at wdc? channel ? flags 0x0000
+
+# ATAPI<->SCSI
+scsibus* at atapiscsi?
+
#### ISA Bus devices.
-isa* at isabr?
+#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
-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
@@ -80,22 +162,10 @@ cd* at scsibus? target ? lun ?
# mostly unused currently
ofbus* at openfirm?
ofrtc* at openfirm?
-#ofdisk* at openfirm? # used for floppy support
+#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
+ofcons* at openfirm?
-#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
diff --git a/sys/arch/powerpc/conf/RAMDISK-NONMAC b/sys/arch/powerpc/conf/RAMDISK-NONMAC
new file mode 100644
index 00000000000..2ae542a6c35
--- /dev/null
+++ b/sys/arch/powerpc/conf/RAMDISK-NONMAC
@@ -0,0 +1,104 @@
+#
+# 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
+options KERNFS
+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/RAMDISKMAC b/sys/arch/powerpc/conf/RAMDISKMAC
deleted file mode 100644
index 82e8704791d..00000000000
--- a/sys/arch/powerpc/conf/RAMDISKMAC
+++ /dev/null
@@ -1,174 +0,0 @@
-# $OpenBSD: RAMDISKMAC,v 1.9 2000/08/07 18:51:22 deraadt 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
-options PPC_MPC106_BUG
-
-# include "../../../conf/GENERIC"
-option TIMEZONE=0 # time zone to adjust RTC time by
-option DST=0 # daylight savings 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 KERNFS # /kern
-option INET # IP + ICMP + TCP + UDP
-option DDB # IP + ICMP + TCP + UDP
-pseudo-device loop 2 # network loopback
-pseudo-device pty 64 # pseudo-terminals
-#pseudo-device ccd 4 # concatenated disk devices
-#pseudo-device ksyms 1 # kernel symbols device
-
-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.
-pchb* at pci? # host bridge identifiers
-#isabr* at pci? # ISA dev bridge.
-#isabr* at mainbus0 # ISA dev bridge.
-
-#### PCI Bus devices.
-
-pci* at mpcpcibr?
-pci* at ppb? bus ?
-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
-#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
-
-# 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
-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
-#mc* at obio? # MACE 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
-#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?
-#scsibus* at adv?
-#scsibus* at ahc?
-#scsibus* at bha?
-#scsibus* at esp?
-#scsibus* at mesh?
-#scsibus* at pcscp?
-
-
-wdc* at obio? flags 0x0
-#wd* at pciide? channel ? drive ?
-#wd* at wdc? channel ? drive ? flags 0x0000
-wd* at wdc? drive ? flags 0x0000
-
-atapiscsi* at wdc? channel ? flags 0x0000
-
-# ATAPI<->SCSI
-scsibus* at atapiscsi?
-
-
-#### 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?
-
-pseudo-device rd 1 # ram disk
-
-# RAMDISK stuff
-option MINIROOTSIZE=8192
-option RAMDISK_HOOKS
-