Significant unification of RAMDISK* config files, making them diffable.

This makes it easier to remove components not required to do an install,
and subsequently add other desireable components ...
In snapshots (in various forks) for about a week.
Do some upgrades and installs, please.

6 files changed, 463 insertions, 641 deletions

diff --git a/sys/arch/sgi/conf/RAMDISK-IP22 b/sys/arch/sgi/conf/RAMDISK-IP22
index d93c5c40aed..20966534254 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP22
+++ b/sys/arch/sgi/conf/RAMDISK-IP22
@@ -1,61 +1,49 @@
-#	$OpenBSD: RAMDISK-IP22,v 1.12 2012/07/18 19:56:02 miod Exp $
+#	$OpenBSD: RAMDISK-IP22,v 1.13 2014/10/10 05:43:35 deraadt Exp $
 #
 # THIS KERNEL IS FOR INDIGO (IP20), INDY (IP22) AND INDIGO2 (IP24) SYSTEMS ONLY.
 
 machine		sgi mips64
-
 maxusers	4
-option		TIMEZONE=0	# minutes west of GMT (for)
-option		DST=0		# use daylight savings rules
 
-# Make options
-makeoption	LINK_ADDRESS="0xffffffff88800000"
-# Force use of 16KB pages. The R5000 Indy, which has the infamous XKPHYS
-# coherency bug wrt ll/sc instructions, can not have more than 256MB of
-# physical memory, all of it fitting within CKSEG0.
-option		PAGE_SHIFT="14"
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
 
-option		DDB
+option		MINIROOTSIZE=10240
+option		RAMDISK_HOOKS
 
 option		EISAVERBOSE
 option		PCIVERBOSE
 
-# Filesystem options
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		FFS		# fast filesystem
-#option		MSDOSFS		# Ability to read write MS-Dos filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-
-# Networking options
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
+option		FFS
+option		CD9660
+option		NFSCLIENT
+option		INET
+option		INET6
 
-# RAMDISK stuff
-option		MINIROOTSIZE=10240
-option		RAMDISK_HOOKS
-
-# Define what targets to support
-option		TGT_INDIGO	# R4x00 Indigo (IP20)
-option		TGT_INDIGO2	# Indigo2, Challenge M (IP22)
-option		TGT_INDY	# Indy, Challenge S (IP24)
-option		ARCBIOS		# mandatory
-option		CPU_R4000	# R4000/R4400 support (IP20/IP22/IP24)
-option		CPU_R4600	# R4600 support (IP22/IP24)
-option		CPU_R5000	# R5000 support (IP24)
+makeoption	LINK_ADDRESS="0xffffffff88800000"
+# Force use of 16KB pages. The R5000 Indy, which has the infamous XKPHYS
+# coherency bug wrt ll/sc instructions, can not have more than 256MB of
+# physical memory, all of it fitting within CKSEG0.
+option		PAGE_SHIFT="14"
+option		TGT_INDIGO		# R4x00 Indigo (IP20)
+option		TGT_INDIGO2		# Indigo2, Challenge M (IP22)
+option		TGT_INDY		# Indy, Challenge S (IP24)
+option		ARCBIOS			# mandatory
+option		CPU_R4000		# R4000/R4400 support (IP20/IP22/IP24)
+option		CPU_R4600		# R4600 support (IP22/IP24)
+option		CPU_R5000		# R5000 support (IP24)
 
-# Specify storage configuration using ramdisk
-config		bsd	root on rd0a swap on rd0b
+config		bsd root on rd0a swap on rd0b
 
-#
-# Definition of system
-#
 mainbus0	at root
 cpu*		at mainbus0
-clock0		at mainbus0	# scheduling clock on Indy
+clock0		at mainbus0		# scheduling clock on Indy
 
-int0		at mainbus0	# Interrupt Controller and scheduling clock
-imc0		at mainbus0	# Memory Controller
+int0		at mainbus0		# Interrupt Controller and scheduling clock
+imc0		at mainbus0		# Memory Controller
 gio0		at imc0
 eisa0		at imc0
 
@@ -63,32 +51,28 @@ hpc0		at gio? addr 0x1fb80000
 hpc1		at gio? addr 0x1fb00000
 hpc2		at gio? addr 0x1f980000
 
-dpclock0	at hpc0		# IP20
-dsclock0	at hpc0		# IP22/24
-sq*		at hpc?		# On-board Ethernet or E++ adapter
-wdsc*		at hpc?		# On-board SCSI or GIO32 SCSI adapter
-pckbc*		at hpc0		# Indy/Indigo2 keyboard and mouse
+dpclock0	at hpc0			# IP20
+dsclock0	at hpc0			# IP22/24
+sq*		at hpc?			# On-board Ethernet or E++ adapter
+wdsc*		at hpc?			# On-board SCSI or GIO32 SCSI adapter
+pckbc*		at hpc0			# Indy/Indigo2 keyboard and mouse
 
 zs0		at hpc0
 zs1		at hpc0
-zstty*		at zs0		# Serial ports
+zstty*		at zs0			# Serial ports
 zskbd*		at zs1 channel 0
 wskbd*		at zskbd? mux 1
-#zsms*		at zs1 channel 1
-#wsmouse*	at zsms? mux 0
 
 pckbd*		at pckbc?
 wskbd*		at pckbd? mux 1
-#pms*		at pckbc?
-#wsmouse*	at pms? mux 0
 
-grtwo*		at gio?		# Express (GR2/GR3) graphics
+grtwo*		at gio?			# Express (GR2/GR3) graphics
 wsdisplay*	at grtwo?
-impact*		at gio?		# Impact graphics
+impact*		at gio?			# Impact graphics
 wsdisplay*	at impact?
-light*		at gio?		# Light/Starter/Entry (LG1/LG2) graphics
+light*		at gio?			# Light/Starter/Entry (LG1/LG2) graphics
 wsdisplay*	at light?
-newport*	at gio?		# Indy Newport and Indigo2 XL graphics
+newport*	at gio?			# Indy Newport and Indigo2 XL graphics
 wsdisplay*	at newport?
 
 giopci*		at gio?
@@ -98,14 +82,8 @@ scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
-#ch*		at scsibus?
-#uk*		at scsibus?
-
-#### PSEUDO Devices
-pseudo-device	loop		1	# network loopback
-pseudo-device	bpfilter	1	# packet filter ports
-
-pseudo-device	rd		1	# Ram disk.
-pseudo-device	bio		1	# ioctl multiplexing device
 
-option		BOOT_CONFIG	# add support for boot -c
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	rd 1
+pseudo-device	bio 1
diff --git a/sys/arch/sgi/conf/RAMDISK-IP26 b/sys/arch/sgi/conf/RAMDISK-IP26
index 9fe61dddd63..8ebcada2d68 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP26
+++ b/sys/arch/sgi/conf/RAMDISK-IP26
@@ -1,76 +1,60 @@
-#	$OpenBSD: RAMDISK-IP26,v 1.1 2012/09/29 21:46:02 miod Exp $
+#	$OpenBSD: RAMDISK-IP26,v 1.2 2014/10/10 05:43:35 deraadt Exp $
 #
 # THIS KERNEL IS FOR POWER INDIGO2 R8000 (IP26) SYSTEMS ONLY.
 
 machine		sgi mips64
-
 maxusers	4
-option		TIMEZONE=0	# minutes west of GMT (for)
-option		DST=0		# use daylight savings rules
 
-# Make options
-makeoption	LINK_ADDRESS="0xa800000008010000"
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
 
-option		DDB
+option		MINIROOTSIZE=10240
+option		RAMDISK_HOOKS
 
 option		EISAVERBOSE
 option		PCIVERBOSE
 
-# Filesystem options
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		FFS		# fast filesystem
-#option		MSDOSFS		# Ability to read write MS-Dos filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
+option		FFS
+option		CD9660
+option		NFSCLIENT
+option		INET
+option		INET6
 
-# Networking options
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
-
-# RAMDISK stuff
-option		MINIROOTSIZE=10240
-option		RAMDISK_HOOKS
-
-# Define what targets to support
-option		TGT_INDIGO2	# Indigo2
-option		ARCBIOS		# mandatory
-option		CPU_R8000	# R8000 support
+makeoption	LINK_ADDRESS="0xa800000008010000"
+option		TGT_INDIGO2		# Indigo2
+option		ARCBIOS			# mandatory
+option		CPU_R8000		# R8000 support
 
-# Specify storage configuration using ramdisk
-config		bsd	root on rd0a swap on rd0b
+config		bsd root on rd0a swap on rd0b
 
-#
-# Definition of system
-#
 mainbus0	at root
 cpu*		at mainbus0
 
-tcc0		at mainbus0	# Streaming Cache Controller
-int0		at mainbus0	# Interrupt Controller and scheduling clock
-imc0		at mainbus0	# Memory Controller
+tcc0		at mainbus0		# Streaming Cache Controller
+int0		at mainbus0		# Interrupt Controller and scheduling clock
+imc0		at mainbus0		# Memory Controller
 gio0		at imc0
 eisa0		at imc0
 
 hpc0		at gio? addr 0x1fb80000
 
-dsclock0	at hpc0	
-sq*		at hpc?		# On-board Ethernet
-wdsc*		at hpc?		# On-board SCSI
-pckbc*		at hpc0		# keyboard and mouse
+dsclock0	at hpc0
+sq*		at hpc?			# On-board Ethernet
+wdsc*		at hpc?			# On-board SCSI
+pckbc*		at hpc0			# keyboard and mouse
 
 zs0		at hpc0
-zstty*		at zs0		# Serial ports
+zstty*		at zs0			# Serial ports
 
 pckbd*		at pckbc?
 wskbd*		at pckbd? mux 1
-#pms*		at pckbc?
-#wsmouse*	at pms? mux 0
 
-grtwo*		at gio?		# Express (GR2/GR3) graphics
+grtwo*		at gio?			# Express (GR2/GR3) graphics
 wsdisplay*	at grtwo?
-#impact*		at gio?		# Impact graphics
-#wsdisplay*	at impact?
-newport*	at gio?		# XL graphics
+newport*	at gio?			# XL graphics
 wsdisplay*	at newport?
 
 giopci*		at gio?
@@ -80,14 +64,8 @@ scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
-#ch*		at scsibus?
-#uk*		at scsibus?
-
-#### PSEUDO Devices
-pseudo-device	loop		1	# network loopback
-pseudo-device	bpfilter	1	# packet filter ports
-
-pseudo-device	rd		1	# Ram disk.
-pseudo-device	bio		1	# ioctl multiplexing device
 
-option		BOOT_CONFIG	# add support for boot -c
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	rd 1
+pseudo-device	bio 1
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 035e2749c12..377ab9be1e5 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,57 +1,43 @@
-#	$OpenBSD: RAMDISK-IP27,v 1.34 2014/09/14 18:59:18 brad Exp $
+#	$OpenBSD: RAMDISK-IP27,v 1.35 2014/10/10 05:43:35 deraadt Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 
 machine		sgi mips64
-
 maxusers	4
-option		TIMEZONE=0	# minutes west of GMT (for)
-option		DST=0		# use daylight savings rules
 
-# Make options
-makeoption	LINK_ADDRESS="0xa800000000040000"
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
+
+option		MINIROOTSIZE=10240
+option		RAMDISK_HOOKS
 
 option		PCIVERBOSE
 option		USBVERBOSE
+option		ONEWIREVERBOSE
 
-option		DDB
-
-# Filesystem options
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		FFS		# fast filesystem
-#option		MSDOSFS		# Ability to read write MS-Dos filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-
-# Networking options
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
-
-# RAMDISK stuff
-option		MINIROOTSIZE=10240
-option		RAMDISK_HOOKS
+option		FFS
+option		CD9660
+option		NFSCLIENT
+option		INET
+option		INET6
 
-# Define what targets to support
-option		TGT_ORIGIN	# IP27/IP35
+makeoption	LINK_ADDRESS="0xa800000000040000"
+option		TGT_ORIGIN		# IP27/IP35
 option		TGT_COHERENT
-option		ARCBIOS	
-option		CPU_R10000	# R10000/R12000/R14000/R16000 support
+option		ARCBIOS
+option		CPU_R10000		# R10000/R12000/R14000/R16000 support
 option		MIPS_PTE64
 
-# Specify storage configuration using ramdisk
-config		bsd	root on rd0a swap on rd0b
+config		bsd root on rd0a swap on rd0b
 
-#
-# Definition of system
-#
 mainbus0	at root
 cpu*		at mainbus0
 clock0		at mainbus0
 
-#### Main local buses
 xbow*		at mainbus0
-
-# XBow devices
 xbridge*	at xbow?
 xbpci*		at xbridge?
 pci*		at xbpci?
@@ -60,7 +46,6 @@ wsdisplay*	at impact?
 odyssey*	at xbow?
 wsdisplay*	at odyssey?
 
-# IOC3
 ioc*		at pci?
 com0		at ioc? base 0x00020178
 com1		at ioc? base 0x00020170
@@ -69,11 +54,9 @@ iec*		at ioc?
 iockbc*		at ioc?
 
 onewire*	at ioc?
-option ONEWIREVERBOSE
 owmac*		at onewire?
 owserial*	at onewire?
 
-# IOC4
 iof*		at pci?
 com0		at iof? base 0x380
 com1		at iof? base 0x388
@@ -83,7 +66,6 @@ com*		at iof?
 dsrtc0		at iof?
 iockbc*		at iof?
 
-#### SCSI controllers
 ahc*		at pci?
 qlw*		at pci?
 qla*		at pci?
@@ -91,138 +73,118 @@ qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
-# USB Controllers
-ohci*		at pci?	# Open Host Controller
-uhci*		at pci?	# Universal Host Controller
-ehci*		at pci?	# Enhanced Host Controller
-
-# USB bus support
+ohci*		at pci?
+uhci*		at pci?
+ehci*		at pci?
 usb*		at ohci?
 usb*		at uhci?
 usb*		at ehci?
 
-# USB devices
-uhub*		at usb?		# USB Hubs
-uhub*		at uhub?	# USB Hubs
-umodem*		at uhub?	# USB Modems/Serial
+uhub*		at usb?
+uhub*		at uhub?
+umodem*		at uhub?		# USB Modems/Serial
 ucom*		at umodem?
-uvscom*		at uhub?	# SUNTAC Slipper U VS-10U serial
+uvscom*		at uhub?		# SUNTAC Slipper U VS-10U serial
 ucom*		at uvscom?
-ubsa*		at uhub?	# Belkin serial adapter
+ubsa*		at uhub?		# Belkin serial adapter
 ucom*		at ubsa?
-#ulpt*		at uhub?	# USB Printers	
-umass*		at uhub?	# USB Mass Storage devices
-uhidev*		at uhub?	# Human Interface Devices
-ums*		at uhidev?	# USB mouse
-wsmouse*	at ums? mux 0
-ukbd*		at uhidev?	# USB keyboard
+umass*		at uhub?
+uhidev*		at uhub?		# Human Interface Devices
+ukbd*		at uhidev?		# USB keyboard
 wskbd*		at ukbd? mux 1
-uhid*		at uhidev?	# USB generic HID support
-atu*		at uhub?	# Atmel AT76c50x based 802.11b
-aue*		at uhub?	# ADMtek AN986 Pegasus Ethernet  
-axe*		at uhub?	# ASIX Electronics AX88172 USB Ethernet
-axen*		at uhub?	# ASIX Electronics AX88179 USB Ethernet
-cdce*		at uhub?	# CDC Ethernet
-cue*		at uhub?	# CATC USB-EL1201A based Ethernet
-kue*		at uhub?	# Kawasaki KL5KUSB101B based Ethernet
-mos*		at uhub?	# MOSCHIP MCS7730/7830 10/100 Ethernet
-otus*		at uhub?	# Atheros AR9001U
-rum*		at uhub?	# Ralink RT2501USB/RT2601USB
-run*		at uhub?	# Ralink RT2700U/RT2800U/RT3000U
-smsc*		at uhub?	# SMSC LAN95xx Ethernet
-uath*		at uhub?	# Atheros AR5005UG/AR5005UX
-udav*		at uhub?	# Davicom DM9601 based Ethernet
-upgt*		at uhub?	# Conexant/Intersil PrismGT SoftMAC USB
-upl*		at uhub?	# Prolific PL2301/PL2302 host-to-host `network'
-ugl*		at uhub?	# Genesys Logic GL620USB-A host-to-host `network'
-ural*		at uhub?	# Ralink RT2500USB
-url*		at uhub?	# Realtek RTL8150L based adapters
-urtw*		at uhub?	# RealTek 8187
-wi*		at uhub?	# WaveLAN IEEE 802.11DS
-zyd*		at uhub?	# Zydas ZD1211
-ugen*		at uhub?	# USB Generic driver
-
-ppb*		at pci?		# PCI-PCI bridges
+uhid*		at uhidev?		# USB generic HID support
+atu*		at uhub?		# Atmel AT76c50x based 802.11b
+aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
+axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
+axen*		at uhub?		# ASIX Electronics AX88179 USB Ethernet
+cdce*		at uhub?		# CDC Ethernet
+cue*		at uhub?		# CATC USB-EL1201A based Ethernet
+kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+mos*		at uhub?		# MOSCHIP MCS7730/7830 10/100 Ethernet
+otus*		at uhub?		# Atheros AR9001U
+rum*		at uhub?		# Ralink RT2501USB/RT2601USB
+run*		at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+smsc*		at uhub?		# SMSC LAN95xx Ethernet
+uath*		at uhub?		# Atheros AR5005UG/AR5005UX
+udav*		at uhub?		# Davicom DM9601 based Ethernet
+upgt*		at uhub?		# Conexant/Intersil PrismGT SoftMAC USB
+upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
+ugl*		at uhub?		# Genesys Logic GL620USB-A host-to-host
+ural*		at uhub?		# Ralink RT2500USB
+url*		at uhub?		# Realtek RTL8150L based adapters
+urtw*		at uhub?		# RealTek 8187
+wi*		at uhub?		# WaveLAN IEEE 802.11DS
+zyd*		at uhub?		# Zydas ZD1211
+ugen*		at uhub?		# USB Generic driver
+
+ppb*		at pci?			# PCI-PCI bridges
 pci*		at ppb?
 
-#### NICs
-pcn*		at pci?		# AMD PCnet-PCI Ethernet
-epic*		at pci?		# SMC EPIC/100 ethernet
-de*		at pci?		# DC21X4X-based ethernet
-dc*		at pci?		# 21143, "tulip" clone ethernet
-sf*		at pci?		# Adaptec AIC-6915 ethernet
-em*		at pci?		# Intel Pro/1000 ethernet
-ep*		at pci?		# 3Com 3c59x
-fxp*		at pci?		# EtherExpress 10/100B ethernet
-mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
-ne*		at pci?		# NE2000-compatible Ethernet
-ti*		at pci?		# Alteon ACEnic gigabit Ethernet
-stge*		at pci?		# Sundance TC9021 GigE
-vr*		at pci?		# VIA Rhine Fast Ethernet
-xl*		at pci?		# 3C9xx ethernet
-re*		at pci?		# Realtek 8169/8169S/8110S
-rl*		at pci?		# Realtek 81[23]9 ethernet
-hme*		at pci?		# Sun Happy Meal
-gem*		at pci?		# Sun 'gem' ethernet
-cas*		at pci?		# Sun Cassini 100/Gigabit
-skc*		at pci?		# SysKonnect GEnesis 984x
-sk*		at skc?		#  each port of above
-mskc*		at pci?		# Marvell Yukon-2
-msk*		at mskc?	#  each port of above
-bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
-vge*		at pci?		# VIA VT612x
-bnx*		at pci?		# Broadcom BCM5706/5708 GigE
-sis*		at pci?		# SiS 900/7016 ethernet
-
-##### Media Independent Interface (mii) drivers
-exphy*		at mii?		# 3Com internal PHYs
-inphy*		at mii?		# Intel 82555 PHYs
-iophy*		at mii?		# Intel 82553 PHYs
-icsphy*		at mii?		# ICS 1890 PHYs
-lxtphy*		at mii?		# Level1 LXT970 PHYs
-nsphy*		at mii?		# NS and compatible PHYs
-nsphyter*	at mii?		# NS and compatible PHYs
-qsphy*		at mii?		# Quality Semi QS6612 PHYs
-sqphy*		at mii?		# Seeq 8x220 PHYs
-luphy*		at mii?		# Lucent LU6612 PHY
-rlphy*		at mii?		# RealTek 8139 internal PHYs
-mtdphy*		at mii?		# Myson MTD972 PHYs
-dcphy*		at mii?		# Digital Clone PHYs
-acphy*		at mii?		# Altima AC101 PHYs
-amphy*		at mii?		# AMD 79C873 PHYs
-tqphy*		at mii?		# TDK 78Q212x PHYs
-bmtphy*		at mii?		# Broadcom 10/100 PHYs
-brgphy*		at mii?		# Broadcom Gigabit PHYs
-ciphy*		at mii?		# Cicada CS8201 10/100/1000 copper PHY
-eephy*		at mii?		# Marvell 88E1000 series PHY
-xmphy*		at mii?		# XaQti XMAC-II PHYs
-nsgphy*		at mii?		# NS gigabit PHYs
-urlphy*		at mii?		# Realtek RTL8150L internal PHY
-rgephy*		at mii?		# Realtek 8169S/8110S PHY
-ipgphy*		at mii?		# IC Plus IP1000A PHYs
-gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
-ukphy*		at mii?		# "unknown" PHYs
-
-#### Keyboard and Mouse
+pcn*		at pci?			# AMD PCnet-PCI Ethernet
+epic*		at pci?			# SMC EPIC/100 ethernet
+de*		at pci?			# DC21X4X-based ethernet
+dc*		at pci?			# 21143, "tulip" clone ethernet
+sf*		at pci?			# Adaptec AIC-6915 ethernet
+em*		at pci?			# Intel Pro/1000 ethernet
+ep*		at pci?			# 3Com 3c59x
+fxp*		at pci?			# EtherExpress 10/100B ethernet
+mtd*		at pci?			# Myson MTD803 3-in-1 Ethernet
+ne*		at pci?			# NE2000-compatible Ethernet
+ti*		at pci?			# Alteon ACEnic gigabit Ethernet
+stge*		at pci?			# Sundance TC9021 GigE
+vr*		at pci?			# VIA Rhine Fast Ethernet
+xl*		at pci?			# 3C9xx ethernet
+re*		at pci?			# Realtek 8169/8169S/8110S
+rl*		at pci?			# Realtek 81[23]9 ethernet
+hme*		at pci?			# Sun Happy Meal
+gem*		at pci?			# Sun 'gem' ethernet
+cas*		at pci?			# Sun Cassini 100/Gigabit
+skc*		at pci?			# SysKonnect GEnesis 984x
+sk*		at skc?			#  each port of above
+mskc*		at pci?			# Marvell Yukon-2
+msk*		at mskc?		#  each port of above
+bge*		at pci?			# Broadcom BCM570x (aka Tigon3)
+vge*		at pci?			# VIA VT612x
+bnx*		at pci?			# Broadcom BCM5706/5708 GigE
+sis*		at pci?			# SiS 900/7016 ethernet
+
+exphy*		at mii?			# 3Com internal PHYs
+inphy*		at mii?			# Intel 82555 PHYs
+iophy*		at mii?			# Intel 82553 PHYs
+icsphy*		at mii?			# ICS 1890 PHYs
+lxtphy*		at mii?			# Level1 LXT970 PHYs
+nsphy*		at mii?			# NS and compatible PHYs
+nsphyter*	at mii?			# NS and compatible PHYs
+qsphy*		at mii?			# Quality Semi QS6612 PHYs
+sqphy*		at mii?			# Seeq 8x220 PHYs
+luphy*		at mii?			# Lucent LU6612 PHY
+rlphy*		at mii?			# RealTek 8139 internal PHYs
+mtdphy*		at mii?			# Myson MTD972 PHYs
+dcphy*		at mii?			# Digital Clone PHYs
+acphy*		at mii?			# Altima AC101 PHYs
+amphy*		at mii?			# AMD 79C873 PHYs
+tqphy*		at mii?			# TDK 78Q212x PHYs
+bmtphy*		at mii?			# Broadcom 10/100 PHYs
+brgphy*		at mii?			# Broadcom Gigabit PHYs
+ciphy*		at mii?			# Cicada CS8201 10/100/1000 copper PHY
+eephy*		at mii?			# Marvell 88E1000 series PHY
+xmphy*		at mii?			# XaQti XMAC-II PHYs
+nsgphy*		at mii?			# NS gigabit PHYs
+urlphy*		at mii?			# Realtek RTL8150L internal PHY
+rgephy*		at mii?			# Realtek 8169S/8110S PHY
+ipgphy*		at mii?			# IC Plus IP1000A PHYs
+gentbi*		at mii?			# Generic 1000BASE-X ten-bit PHY
+ukphy*		at mii?			# "unknown" PHYs
+
 pckbd*		at iockbc?
-pms*		at iockbc?
 wskbd*		at pckbd? mux 1
-wsmouse*	at pms? mux 0
-
-#### SCSI Bus devices
 
 scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
-#ch*		at scsibus?
-#uk*		at scsibus?
-
-#### PSEUDO Devices
-pseudo-device	loop		1	# network loopback
-pseudo-device	bpfilter	1	# packet filter ports
-
-pseudo-device	rd		1	# Ram disk.
-pseudo-device	bio		1	# ioctl multiplexing device
 
-option		BOOT_CONFIG	# add support for boot -c
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	rd 1
+pseudo-device	bio 1
diff --git a/sys/arch/sgi/conf/RAMDISK-IP28 b/sys/arch/sgi/conf/RAMDISK-IP28
index a1c6b0a42be..f7dfbef4c87 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP28
+++ b/sys/arch/sgi/conf/RAMDISK-IP28
@@ -1,75 +1,61 @@
-#	$OpenBSD: RAMDISK-IP28,v 1.3 2012/07/14 19:53:27 miod Exp $
+#	$OpenBSD: RAMDISK-IP28,v 1.4 2014/10/10 05:43:35 deraadt Exp $
 #
 # THIS KERNEL IS FOR POWER INDIGO2 R10000 (IP28) SYSTEMS ONLY.
 
 machine		sgi mips64
-
 maxusers	4
-option		TIMEZONE=0	# minutes west of GMT (for)
-option		DST=0		# use daylight savings rules
 
-# Make options
-makeoption	LINK_ADDRESS="0xa800000020020000"
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
 
-option		DDB
+option		MINIROOTSIZE=10240
+option		RAMDISK_HOOKS
 
-option		EISAVERBOSE
 option		PCIVERBOSE
+option		EISAVERBOSE
 
-# Filesystem options
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		FFS		# fast filesystem
-#option		MSDOSFS		# Ability to read write MS-Dos filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-
-# Networking options
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
+option		FFS
+option		CD9660
+option		NFSCLIENT
+option		INET
+option		INET6
 
-# RAMDISK stuff
-option		MINIROOTSIZE=10240
-option		RAMDISK_HOOKS
-
-# Define what targets to support
-option		TGT_INDIGO2	# Indigo2
-option		ARCBIOS		# mandatory
-option		CPU_R10000	# R10000 support
+makeoption	LINK_ADDRESS="0xa800000020020000"
+option		TGT_INDIGO2		# Indigo2
+option		ARCBIOS			# mandatory
+option		CPU_R10000		# R10000 support
 
-# Specify storage configuration using ramdisk
-config		bsd	root on rd0a swap on rd0b
+config		bsd root on rd0a swap on rd0b
 
-#
-# Definition of system
-#
 mainbus0	at root
 cpu*		at mainbus0
 
-int0		at mainbus0	# Interrupt Controller and scheduling clock
-imc0		at mainbus0	# Memory Controller
+int0		at mainbus0		# Interrupt Controller and scheduling clock
+imc0		at mainbus0		# Memory Controller
 gio0		at imc0
 eisa0		at imc0
 
 hpc0		at gio? addr 0x1fb80000
 
-dsclock0	at hpc0	
-sq*		at hpc?		# On-board Ethernet
-wdsc*		at hpc?		# On-board SCSI
-pckbc*		at hpc0		# keyboard and mouse
+dsclock0	at hpc0
+sq*		at hpc?			# On-board Ethernet
+wdsc*		at hpc?			# On-board SCSI
+pckbc*		at hpc0			# keyboard and mouse
 
 zs0		at hpc0
-zstty*		at zs0		# Serial ports
+zstty*		at zs0			# Serial ports
 
 pckbd*		at pckbc?
 wskbd*		at pckbd? mux 1
-#pms*		at pckbc?
-#wsmouse*	at pms? mux 0
 
-grtwo*		at gio?		# Express (GR2/GR3) graphics
+grtwo*		at gio?			# Express (GR2/GR3) graphics
 wsdisplay*	at grtwo?
-impact*		at gio?		# Impact graphics
+impact*		at gio?			# Impact graphics
 wsdisplay*	at impact?
-newport*	at gio?		# XL graphics
+newport*	at gio?			# XL graphics
 wsdisplay*	at newport?
 
 giopci*		at gio?
@@ -79,14 +65,8 @@ scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
-#ch*		at scsibus?
-#uk*		at scsibus?
-
-#### PSEUDO Devices
-pseudo-device	loop		1	# network loopback
-pseudo-device	bpfilter	1	# packet filter ports
-
-pseudo-device	rd		1	# Ram disk.
-pseudo-device	bio		1	# ioctl multiplexing device
 
-option		BOOT_CONFIG	# add support for boot -c
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	rd 1
+pseudo-device	bio 1
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index 9e72157dee1..7888a5a6e22 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,56 +1,42 @@
-#	$OpenBSD: RAMDISK-IP30,v 1.29 2014/09/14 18:59:18 brad Exp $
+#	$OpenBSD: RAMDISK-IP30,v 1.30 2014/10/10 05:43:35 deraadt Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 
 machine		sgi mips64
-
 maxusers	4
-option		TIMEZONE=0	# minutes west of GMT (for)
-option		DST=0		# use daylight savings rules
 
-# Make options
-makeoption	LINK_ADDRESS="0xa800000020020000"
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
+
+option		MINIROOTSIZE=10240
+option		RAMDISK_HOOKS
 
 option		PCIVERBOSE
 option		USBVERBOSE
+option		ONEWIREVERBOSE
 
-option		DDB
+option		FFS
+option		CD9660
+option		NFSCLIENT
+option		INET
+option		INET6
 
-# Filesystem options
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		FFS		# fast filesystem
-#option		MSDOSFS		# Ability to read write MS-Dos filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-
-# Networking options
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
-
-# RAMDISK stuff
-option		MINIROOTSIZE=10240
-option		RAMDISK_HOOKS
+makeoption	LINK_ADDRESS="0xa800000020020000"
 
-# Define what targets to support
-option		TGT_OCTANE	# Octane, Octane 2
+option		TGT_OCTANE		# Octane, Octane 2
 option		TGT_COHERENT
 option		ARCBIOS
-option		CPU_R10000	# R10000/R12000/R14000/R16000 support
+option		CPU_R10000		# R10000/R12000/R14000/R16000 support
 
-# Specify storage configuration using ramdisk
-config		bsd	root on rd0a swap on rd0b
+config		bsd root on rd0a swap on rd0b
 
-#
-# Definition of system
-#
 mainbus0	at root
 cpu*		at mainbus0
 clock0		at mainbus0
-
-#### Main local buses
 xbow0		at mainbus0
-
-# XBow devices
 xheart*		at xbow?
 onewire*	at xheart?
 xbridge*	at xbow?
@@ -61,7 +47,6 @@ wsdisplay*	at impact?
 odyssey*	at xbow?
 wsdisplay*	at odyssey?
 
-# IOC3
 ioc*		at pci?
 com0		at ioc? base 0x00020178
 com1		at ioc? base 0x00020170
@@ -71,11 +56,9 @@ iec*		at ioc?
 iockbc*		at ioc?
 
 onewire*	at ioc?
-option ONEWIREVERBOSE
 owmac*		at onewire?
 owserial*	at onewire?
 
-#### SCSI controllers
 ahc*		at pci?
 qlw*		at pci?
 qla*		at pci?
@@ -83,138 +66,118 @@ qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
-# USB Controllers
-ohci*		at pci?	# Open Host Controller
-uhci*		at pci?	# Universal Host Controller
-ehci*		at pci?	# Enhanced Host Controller
-
-# USB bus support
+ohci*		at pci?
+uhci*		at pci?
+ehci*		at pci?
 usb*		at ohci?
 usb*		at uhci?
 usb*		at ehci?
 
-# USB devices
-uhub*		at usb?		# USB Hubs
-uhub*		at uhub?	# USB Hubs
-umodem*		at uhub?	# USB Modems/Serial
+uhub*		at usb?
+uhub*		at uhub?
+umodem*		at uhub?		# USB Modems/Serial
 ucom*		at umodem?
-uvscom*		at uhub?	# SUNTAC Slipper U VS-10U serial
+uvscom*		at uhub?		# SUNTAC Slipper U VS-10U serial
 ucom*		at uvscom?
-ubsa*		at uhub?	# Belkin serial adapter
+ubsa*		at uhub?		# Belkin serial adapter
 ucom*		at ubsa?
-#ulpt*		at uhub?	# USB Printers	
-umass*		at uhub?	# USB Mass Storage devices
-uhidev*		at uhub?	# Human Interface Devices
-ums*		at uhidev?	# USB mouse
-wsmouse*	at ums? mux 0
-ukbd*		at uhidev?	# USB keyboard
+umass*		at uhub?
+uhidev*		at uhub?		# Human Interface Devices
+ukbd*		at uhidev?		# USB keyboard
 wskbd*		at ukbd? mux 1
-uhid*		at uhidev?	# USB generic HID support
-atu*		at uhub?	# Atmel AT76c50x based 802.11b
-aue*		at uhub?	# ADMtek AN986 Pegasus Ethernet  
-axe*		at uhub?	# ASIX Electronics AX88172 USB Ethernet
-axen*		at uhub?	# ASIX Electronics AX88179 USB Ethernet
-cdce*		at uhub?	# CDC Ethernet
-cue*		at uhub?	# CATC USB-EL1201A based Ethernet
-kue*		at uhub?	# Kawasaki KL5KUSB101B based Ethernet
-mos*		at uhub?	# MOSCHIP MCS7730/7830 10/100 Ethernet
-otus*		at uhub?	# Atheros AR9001U
-rum*		at uhub?	# Ralink RT2501USB/RT2601USB
-run*		at uhub?	# Ralink RT2700U/RT2800U/RT3000U
-smsc*		at uhub?	# SMSC LAN95xx Ethernet
-uath*		at uhub?	# Atheros AR5005UG/AR5005UX
-udav*		at uhub?	# Davicom DM9601 based Ethernet
-upgt*		at uhub?	# Conexant/Intersil PrismGT SoftMAC USB
-upl*		at uhub?	# Prolific PL2301/PL2302 host-to-host `network'
-ugl*		at uhub?	# Genesys Logic GL620USB-A host-to-host `network'
-ural*		at uhub?	# Ralink RT2500USB
-url*		at uhub?	# Realtek RTL8150L based adapters
-urtw*		at uhub?	# RealTek 8187
-wi*		at uhub?	# WaveLAN IEEE 802.11DS
-zyd*		at uhub?	# Zydas ZD1211
-ugen*		at uhub?	# USB Generic driver
-
-ppb*		at pci?		# PCI-PCI bridges
+uhid*		at uhidev?		# USB generic HID support
+atu*		at uhub?		# Atmel AT76c50x based 802.11b
+aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
+axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
+axen*		at uhub?		# ASIX Electronics AX88179 USB Ethernet
+cdce*		at uhub?		# CDC Ethernet
+cue*		at uhub?		# CATC USB-EL1201A based Ethernet
+kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+mos*		at uhub?		# MOSCHIP MCS7730/7830 10/100 Ethernet
+otus*		at uhub?		# Atheros AR9001U
+rum*		at uhub?		# Ralink RT2501USB/RT2601USB
+run*		at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+smsc*		at uhub?		# SMSC LAN95xx Ethernet
+uath*		at uhub?		# Atheros AR5005UG/AR5005UX
+udav*		at uhub?		# Davicom DM9601 based Ethernet
+upgt*		at uhub?		# Conexant/Intersil PrismGT SoftMAC USB
+upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
+ugl*		at uhub?		# Genesys Logic GL620USB-A host-to-host
+ural*		at uhub?		# Ralink RT2500USB
+url*		at uhub?		# Realtek RTL8150L based adapters
+urtw*		at uhub?		# RealTek 8187
+wi*		at uhub?		# WaveLAN IEEE 802.11DS
+zyd*		at uhub?		# Zydas ZD1211
+ugen*		at uhub?		# USB Generic driver
+
+ppb*		at pci?			# PCI-PCI bridges
 pci*		at ppb?
 
-#### NICs
-pcn*		at pci?		# AMD PCnet-PCI Ethernet
-epic*		at pci?		# SMC EPIC/100 ethernet
-de*		at pci?		# DC21X4X-based ethernet
-dc*		at pci?		# 21143, "tulip" clone ethernet
-sf*		at pci?		# Adaptec AIC-6915 ethernet
-em*		at pci?		# Intel Pro/1000 ethernet
-ep*		at pci?		# 3Com 3c59x
-fxp*		at pci?		# EtherExpress 10/100B ethernet
-mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
-ne*		at pci?		# NE2000-compatible Ethernet
-ti*		at pci?		# Alteon ACEnic gigabit Ethernet
-stge*		at pci?		# Sundance TC9021 GigE
-vr*		at pci?		# VIA Rhine Fast Ethernet
-xl*		at pci?		# 3C9xx ethernet
-re*		at pci?		# Realtek 8169/8169S/8110S
-rl*		at pci?		# Realtek 81[23]9 ethernet
-hme*		at pci?		# Sun Happy Meal
-gem*		at pci?		# Sun 'gem' ethernet
-cas*		at pci?		# Sun Cassini 100/Gigabit
-skc*		at pci?		# SysKonnect GEnesis 984x
-sk*		at skc?		#  each port of above
-mskc*		at pci?		# Marvell Yukon-2
-msk*		at mskc?	#  each port of above
-bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
-vge*		at pci?		# VIA VT612x
-bnx*		at pci?		# Broadcom BCM5706/5708 GigE
-sis*		at pci?		# SiS 900/7016 ethernet
-
-##### Media Independent Interface (mii) drivers
-exphy*		at mii?		# 3Com internal PHYs
-inphy*		at mii?		# Intel 82555 PHYs
-iophy*		at mii?		# Intel 82553 PHYs
-icsphy*		at mii?		# ICS 1890 PHYs
-lxtphy*		at mii?		# Level1 LXT970 PHYs
-nsphy*		at mii?		# NS and compatible PHYs
-nsphyter*	at mii?		# NS and compatible PHYs
-qsphy*		at mii?		# Quality Semi QS6612 PHYs
-sqphy*		at mii?		# Seeq 8x220 PHYs
-luphy*		at mii?		# Lucent LU6612 PHY
-rlphy*		at mii?		# RealTek 8139 internal PHYs
-mtdphy*		at mii?		# Myson MTD972 PHYs
-dcphy*		at mii?		# Digital Clone PHYs
-acphy*		at mii?		# Altima AC101 PHYs
-amphy*		at mii?		# AMD 79C873 PHYs
-tqphy*		at mii?		# TDK 78Q212x PHYs
-bmtphy*		at mii?		# Broadcom 10/100 PHYs
-brgphy*		at mii?		# Broadcom Gigabit PHYs
-ciphy*		at mii?		# Cicada CS8201 10/100/1000 copper PHY
-eephy*		at mii?		# Marvell 88E1000 series PHY
-xmphy*		at mii?		# XaQti XMAC-II PHYs
-nsgphy*		at mii?		# NS gigabit PHYs
-urlphy*		at mii?		# Realtek RTL8150L internal PHY
-rgephy*		at mii?		# Realtek 8169S/8110S PHY
-ipgphy*		at mii?		# IC Plus IP1000A PHYs
-gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
-ukphy*		at mii?		# "unknown" PHYs
-
-#### Keyboard and Mouse
+pcn*		at pci?			# AMD PCnet-PCI Ethernet
+epic*		at pci?			# SMC EPIC/100 ethernet
+de*		at pci?			# DC21X4X-based ethernet
+dc*		at pci?			# 21143, "tulip" clone ethernet
+sf*		at pci?			# Adaptec AIC-6915 ethernet
+em*		at pci?			# Intel Pro/1000 ethernet
+ep*		at pci?			# 3Com 3c59x
+fxp*		at pci?			# EtherExpress 10/100B ethernet
+mtd*		at pci?			# Myson MTD803 3-in-1 Ethernet
+ne*		at pci?			# NE2000-compatible Ethernet
+ti*		at pci?			# Alteon ACEnic gigabit Ethernet
+stge*		at pci?			# Sundance TC9021 GigE
+vr*		at pci?			# VIA Rhine Fast Ethernet
+xl*		at pci?			# 3C9xx ethernet
+re*		at pci?			# Realtek 8169/8169S/8110S
+rl*		at pci?			# Realtek 81[23]9 ethernet
+hme*		at pci?			# Sun Happy Meal
+gem*		at pci?			# Sun 'gem' ethernet
+cas*		at pci?			# Sun Cassini 100/Gigabit
+skc*		at pci?			# SysKonnect GEnesis 984x
+sk*		at skc?			#  each port of above
+mskc*		at pci?			# Marvell Yukon-2
+msk*		at mskc?		#  each port of above
+bge*		at pci?			# Broadcom BCM570x (aka Tigon3)
+vge*		at pci?			# VIA VT612x
+bnx*		at pci?			# Broadcom BCM5706/5708 GigE
+sis*		at pci?			# SiS 900/7016 ethernet
+
+exphy*		at mii?			# 3Com internal PHYs
+inphy*		at mii?			# Intel 82555 PHYs
+iophy*		at mii?			# Intel 82553 PHYs
+icsphy*		at mii?			# ICS 1890 PHYs
+lxtphy*		at mii?			# Level1 LXT970 PHYs
+nsphy*		at mii?			# NS and compatible PHYs
+nsphyter*	at mii?			# NS and compatible PHYs
+qsphy*		at mii?			# Quality Semi QS6612 PHYs
+sqphy*		at mii?			# Seeq 8x220 PHYs
+luphy*		at mii?			# Lucent LU6612 PHY
+rlphy*		at mii?			# RealTek 8139 internal PHYs
+mtdphy*		at mii?			# Myson MTD972 PHYs
+dcphy*		at mii?			# Digital Clone PHYs
+acphy*		at mii?			# Altima AC101 PHYs
+amphy*		at mii?			# AMD 79C873 PHYs
+tqphy*		at mii?			# TDK 78Q212x PHYs
+bmtphy*		at mii?			# Broadcom 10/100 PHYs
+brgphy*		at mii?			# Broadcom Gigabit PHYs
+ciphy*		at mii?			# Cicada CS8201 10/100/1000 copper PHY
+eephy*		at mii?			# Marvell 88E1000 series PHY
+xmphy*		at mii?			# XaQti XMAC-II PHYs
+nsgphy*		at mii?			# NS gigabit PHYs
+urlphy*		at mii?			# Realtek RTL8150L internal PHY
+rgephy*		at mii?			# Realtek 8169S/8110S PHY
+ipgphy*		at mii?			# IC Plus IP1000A PHYs
+gentbi*		at mii?			# Generic 1000BASE-X ten-bit PHY
+ukphy*		at mii?			# "unknown" PHYs
+
 pckbd*		at iockbc?
-pms*		at iockbc?
 wskbd*		at pckbd? mux 1
-wsmouse*	at pms? mux 0
-
-#### SCSI Bus devices
 
 scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
-#ch*		at scsibus?
-#uk*		at scsibus?
-
-#### PSEUDO Devices
-pseudo-device	loop		1	# network loopback
-pseudo-device	bpfilter	1	# packet filter ports
-
-pseudo-device	rd		1	# Ram disk.
-pseudo-device	bio		1	# ioctl multiplexing device
 
-option		BOOT_CONFIG	# add support for boot -c
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	rd 1
+pseudo-device	bio 1
diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32
index 833a7e42517..38114406bf4 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP32
+++ b/sys/arch/sgi/conf/RAMDISK-IP32
@@ -1,71 +1,52 @@
-#	$OpenBSD: RAMDISK-IP32,v 1.25 2014/09/14 18:59:18 brad Exp $
+#	$OpenBSD: RAMDISK-IP32,v 1.26 2014/10/10 05:43:35 deraadt Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 
 machine		sgi mips64
-
 maxusers	4
-option		TIMEZONE=0	# minutes west of GMT (for)
-option		DST=0		# use daylight savings rules
 
-# Make options
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
+
+option		MINIROOTSIZE=10240
+option		RAMDISK_HOOKS
+
 makeoption	LINK_ADDRESS="0xffffffff80100000"
 
 option		PCIVERBOSE
 option		USBVERBOSE
 
-option		DDB
-
-# Filesystem options
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FFS		# fast filesystem
-option		FFS2		# fast filesystem 2
-#option		MSDOSFS		# Ability to read write MS-Dos filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
+option		CD9660
+option		FFS
+option		FFS2
+option		NFSCLIENT
+option		INET
+option		INET6
 
-# Networking options
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
-
-# RAMDISK stuff
-option		MINIROOTSIZE=10240
-option		RAMDISK_HOOKS
-
-# Define what targets to support
-option		TGT_O2		# O2, O2+
+option		TGT_O2			# O2, O2+
 option		ARCBIOS
-option		CPU_R5000	# R5000/RM5200 support
-option		CPU_RM7000	# RM7000 support
-option		CPU_R10000	# R10000/R12000/R14000/R16000 support
+option		CPU_R5000		# R5000/RM5200 support
+option		CPU_RM7000		# RM7000 support
+option		CPU_R10000		# R10000/R12000/R14000/R16000 support
 
-# Specify storage configuration using ramdisk
-config		bsd	root on rd0a swap on rd0b
+config		bsd root on rd0a swap on rd0b
 
-#
-# Definition of system
-#
 mainbus0	at root
 cpu*		at mainbus0
 clock0		at mainbus0
-
-#### Main local buses
-macebus0	at mainbus0	# MACE controller localbus.
-
-# GBE Framebuffer
-gbe0		at mainbus0
-
-#### Localbus devices
+macebus0	at mainbus0		# MACE controller localbus.
+gbe0		at mainbus0		# GBE Framebuffer
 mec0		at macebus0
 mkbc0		at macebus0
 com0		at macebus0 base 0x00390000
 com1		at macebus0 base 0x00398000
 dsrtc0		at macebus0
+macepcibr0	at macebus0		# MACE controller PCI Bus bridge.
+pci*		at macepcibr?		# PCI is on pci bridge
 
-#### PCI Bus
-macepcibr0	at macebus0	# MACE controller PCI Bus bridge.
-pci*		at macepcibr?	# PCI is on pci bridge
-
-#### SCSI controllers
 ahc*		at pci?
 qlw*		at pci?
 qla*		at pci?
@@ -73,139 +54,119 @@ qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
-# USB Controllers
-ohci*		at pci?	# Open Host Controller
-uhci*		at pci?	# Universal Host Controller
-ehci*		at pci?	# Enhanced Host Controller
-
-# USB bus support
+ohci*		at pci?
+uhci*		at pci?
+ehci*		at pci?
 usb*		at ohci?
 usb*		at uhci?
 usb*		at ehci?
 
-# USB devices
-uhub*		at usb?		# USB Hubs
-uhub*		at uhub?	# USB Hubs
-umodem*		at uhub?	# USB Modems/Serial
+uhub*		at usb?
+uhub*		at uhub?
+umodem*		at uhub?		# USB Modems/Serial
 ucom*		at umodem?
-uvscom*		at uhub?	# SUNTAC Slipper U VS-10U serial
+uvscom*		at uhub?		# SUNTAC Slipper U VS-10U serial
 ucom*		at uvscom?
-ubsa*		at uhub?	# Belkin serial adapter
+ubsa*		at uhub?		# Belkin serial adapter
 ucom*		at ubsa?
-#ulpt*		at uhub?	# USB Printers	
-umass*		at uhub?	# USB Mass Storage devices
-uhidev*		at uhub?	# Human Interface Devices
-ums*		at uhidev?	# USB mouse
-wsmouse*	at ums? mux 0
-ukbd*		at uhidev?	# USB keyboard
+umass*		at uhub?
+uhidev*		at uhub?		# Human Interface Devices
+ukbd*		at uhidev?		# USB keyboard
 wskbd*		at ukbd? mux 1
-uhid*		at uhidev?	# USB generic HID support
-atu*		at uhub?	# Atmel AT76c50x based 802.11b
-aue*		at uhub?	# ADMtek AN986 Pegasus Ethernet  
-axe*		at uhub?	# ASIX Electronics AX88172 USB Ethernet
-axen*		at uhub?	# ASIX Electronics AX88179 USB Ethernet
-cdce*		at uhub?	# CDC Ethernet
-cue*		at uhub?	# CATC USB-EL1201A based Ethernet
-kue*		at uhub?	# Kawasaki KL5KUSB101B based Ethernet
-mos*		at uhub?	# MOSCHIP MCS7730/7830 10/100 Ethernet
-otus*		at uhub?	# Atheros AR9001U
-rum*		at uhub?	# Ralink RT2501USB/RT2601USB
-run*		at uhub?	# Ralink RT2700U/RT2800U/RT3000U
-smsc*		at uhub?	# SMSC LAN95xx Ethernet
-uath*		at uhub?	# Atheros AR5005UG/AR5005UX
-udav*		at uhub?	# Davicom DM9601 based Ethernet
-upgt*		at uhub?	# Conexant/Intersil PrismGT SoftMAC USB
-upl*		at uhub?	# Prolific PL2301/PL2302 host-to-host `network'
-ugl*		at uhub?	# Genesys Logic GL620USB-A host-to-host `network'
-ural*		at uhub?	# Ralink RT2500USB
-url*		at uhub?	# Realtek RTL8150L based adapters
-urtw*		at uhub?	# RealTek 8187
-wi*		at uhub?	# WaveLAN IEEE 802.11DS
-zyd*		at uhub?	# Zydas ZD1211
-ugen*		at uhub?	# USB Generic driver
-
-ppb*		at pci?		# PCI-PCI bridges
+uhid*		at uhidev?		# USB generic HID support
+atu*		at uhub?		# Atmel AT76c50x based 802.11b
+aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
+axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
+axen*		at uhub?		# ASIX Electronics AX88179 USB Ethernet
+cdce*		at uhub?		# CDC Ethernet
+cue*		at uhub?		# CATC USB-EL1201A based Ethernet
+kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+mos*		at uhub?		# MOSCHIP MCS7730/7830 10/100 Ethernet
+otus*		at uhub?		# Atheros AR9001U
+rum*		at uhub?		# Ralink RT2501USB/RT2601USB
+run*		at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+smsc*		at uhub?		# SMSC LAN95xx Ethernet
+uath*		at uhub?		# Atheros AR5005UG/AR5005UX
+udav*		at uhub?		# Davicom DM9601 based Ethernet
+upgt*		at uhub?		# Conexant/Intersil PrismGT SoftMAC USB
+upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
+ugl*		at uhub?		# Genesys Logic GL620USB-A host-to-host
+ural*		at uhub?		# Ralink RT2500USB
+url*		at uhub?		# Realtek RTL8150L based adapters
+urtw*		at uhub?		# RealTek 8187
+wi*		at uhub?		# WaveLAN IEEE 802.11DS
+zyd*		at uhub?		# Zydas ZD1211
+ugen*		at uhub?		# USB Generic driver
+
+ppb*		at pci?
 pci*		at ppb?
 
-#### NICs
-pcn*		at pci?		# AMD PCnet-PCI Ethernet
-epic*		at pci?		# SMC EPIC/100 ethernet
-de*		at pci?		# DC21X4X-based ethernet
-dc*		at pci?		# 21143, "tulip" clone ethernet
-sf*		at pci?		# Adaptec AIC-6915 ethernet
-em*		at pci?		# Intel Pro/1000 ethernet
-ep*		at pci?		# 3Com 3c59x
-fxp*		at pci?		# EtherExpress 10/100B ethernet
-mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
-ne*		at pci?		# NE2000-compatible Ethernet
-ti*		at pci?		# Alteon ACEnic gigabit Ethernet
-stge*		at pci?		# Sundance TC9021 GigE
-vr*		at pci?		# VIA Rhine Fast Ethernet
-xl*		at pci?		# 3C9xx ethernet
-re*		at pci?		# Realtek 8169/8169S/8110S
-rl*		at pci?		# Realtek 81[23]9 ethernet
-hme*		at pci?		# Sun Happy Meal
-gem*		at pci?		# Sun 'gem' ethernet
-cas*		at pci?		# Sun Cassini 100/Gigabit
-skc*		at pci?		# SysKonnect GEnesis 984x
-sk*		at skc?		#  each port of above
-mskc*		at pci?		# Marvell Yukon-2
-msk*		at mskc?	#  each port of above
-bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
-vge*		at pci?		# VIA VT612x
-bnx*		at pci?		# Broadcom BCM5706/5708 GigE
-sis*		at pci?		# SiS 900/7016 ethernet
-
-##### Media Independent Interface (mii) drivers
-exphy*		at mii?		# 3Com internal PHYs
-inphy*		at mii?		# Intel 82555 PHYs
-iophy*		at mii?		# Intel 82553 PHYs
-icsphy*		at mii?		# ICS 1890 PHYs
-lxtphy*		at mii?		# Level1 LXT970 PHYs
-nsphy*		at mii?		# NS and compatible PHYs
-nsphyter*	at mii?		# NS and compatible PHYs
-qsphy*		at mii?		# Quality Semi QS6612 PHYs
-sqphy*		at mii?		# Seeq 8x220 PHYs
-luphy*		at mii?		# Lucent LU6612 PHY
-rlphy*		at mii?		# RealTek 8139 internal PHYs
-mtdphy*		at mii?		# Myson MTD972 PHYs
-dcphy*		at mii?		# Digital Clone PHYs
-acphy*		at mii?		# Altima AC101 PHYs
-amphy*		at mii?		# AMD 79C873 PHYs
-tqphy*		at mii?		# TDK 78Q212x PHYs
-bmtphy*		at mii?		# Broadcom 10/100 PHYs
-brgphy*		at mii?		# Broadcom Gigabit PHYs
-ciphy*		at mii?		# Cicada CS8201 10/100/1000 copper PHY
-eephy*		at mii?		# Marvell 88E1000 series PHY
-xmphy*		at mii?		# XaQti XMAC-II PHYs
-nsgphy*		at mii?		# NS gigabit PHYs
-urlphy*		at mii?		# Realtek RTL8150L internal PHY
-rgephy*		at mii?		# Realtek 8169S/8110S PHY
-ipgphy*		at mii?		# IC Plus IP1000A PHYs
-gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
-ukphy*		at mii?		# "unknown" PHYs
-
-#### WS console
-wsdisplay*	at gbe?
+pcn*		at pci?			# AMD PCnet-PCI Ethernet
+epic*		at pci?			# SMC EPIC/100 ethernet
+de*		at pci?			# DC21X4X-based ethernet
+dc*		at pci?			# 21143, "tulip" clone ethernet
+sf*		at pci?			# Adaptec AIC-6915 ethernet
+em*		at pci?			# Intel Pro/1000 ethernet
+ep*		at pci?			# 3Com 3c59x
+fxp*		at pci?			# EtherExpress 10/100B ethernet
+mtd*		at pci?			# Myson MTD803 3-in-1 Ethernet
+ne*		at pci?			# NE2000-compatible Ethernet
+ti*		at pci?			# Alteon ACEnic gigabit Ethernet
+stge*		at pci?			# Sundance TC9021 GigE
+vr*		at pci?			# VIA Rhine Fast Ethernet
+xl*		at pci?			# 3C9xx ethernet
+re*		at pci?			# Realtek 8169/8169S/8110S
+rl*		at pci?			# Realtek 81[23]9 ethernet
+hme*		at pci?			# Sun Happy Meal
+gem*		at pci?			# Sun 'gem' ethernet
+cas*		at pci?			# Sun Cassini 100/Gigabit
+skc*		at pci?			# SysKonnect GEnesis 984x
+sk*		at skc?			#  each port of above
+mskc*		at pci?			# Marvell Yukon-2
+msk*		at mskc?		#  each port of above
+bge*		at pci?			# Broadcom BCM570x (aka Tigon3)
+vge*		at pci?			# VIA VT612x
+bnx*		at pci?			# Broadcom BCM5706/5708 GigE
+sis*		at pci?			# SiS 900/7016 ethernet
+
+exphy*		at mii?			# 3Com internal PHYs
+inphy*		at mii?			# Intel 82555 PHYs
+iophy*		at mii?			# Intel 82553 PHYs
+icsphy*		at mii?			# ICS 1890 PHYs
+lxtphy*		at mii?			# Level1 LXT970 PHYs
+nsphy*		at mii?			# NS and compatible PHYs
+nsphyter*	at mii?			# NS and compatible PHYs
+qsphy*		at mii?			# Quality Semi QS6612 PHYs
+sqphy*		at mii?			# Seeq 8x220 PHYs
+luphy*		at mii?			# Lucent LU6612 PHY
+rlphy*		at mii?			# RealTek 8139 internal PHYs
+mtdphy*		at mii?			# Myson MTD972 PHYs
+dcphy*		at mii?			# Digital Clone PHYs
+acphy*		at mii?			# Altima AC101 PHYs
+amphy*		at mii?			# AMD 79C873 PHYs
+tqphy*		at mii?			# TDK 78Q212x PHYs
+bmtphy*		at mii?			# Broadcom 10/100 PHYs
+brgphy*		at mii?			# Broadcom Gigabit PHYs
+ciphy*		at mii?			# Cicada CS8201 10/100/1000 copper PHY
+eephy*		at mii?			# Marvell 88E1000 series PHY
+xmphy*		at mii?			# XaQti XMAC-II PHYs
+nsgphy*		at mii?			# NS gigabit PHYs
+urlphy*		at mii?			# Realtek RTL8150L internal PHY
+rgephy*		at mii?			# Realtek 8169S/8110S PHY
+ipgphy*		at mii?			# IC Plus IP1000A PHYs
+gentbi*		at mii?			# Generic 1000BASE-X ten-bit PHY
+ukphy*		at mii?			# "unknown" PHYs
 
-#### Keyboard and Mouse
+wsdisplay*	at gbe?
 pckbd*		at mkbc?
 wskbd*		at pckbd? console ?
 
-#### SCSI Bus devices
-
 scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
-#ch*		at scsibus?
-#uk*		at scsibus?
-
-#### PSEUDO Devices
-pseudo-device	loop		1	# network loopback
-pseudo-device	bpfilter	1	# packet filter ports
-
-pseudo-device	rd		1	# Ram disk.
-pseudo-device	bio		1	# ioctl multiplexing device
 
-option		BOOT_CONFIG	# add support for boot -c
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	rd 1
+pseudo-device	bio 1