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.

1 files changed, 110 insertions, 161 deletions

diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 930c0a06ffb..ec20c23ec59 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,144 +1,128 @@
-#	$OpenBSD: RAMDISK,v 1.106 2014/09/14 18:59:18 brad Exp $
-#
-# PPC GENERIC config file
-#
+#	$OpenBSD: RAMDISK,v 1.107 2014/10/10 05:43:35 deraadt Exp $
 
 machine		macppc powerpc
+maxusers	4
 
-maxusers	32
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
+
+option		MINIROOTSIZE=8192
+option		RAMDISK_HOOKS
 
 option		PCIVERBOSE
 
-# include "../../../conf/GENERIC"
-option		TIMEZONE=0	# time zone to adjust RTC time by
-option		DST=0		# daylight saving time used by RTC
-option		COMPAT_43	# and 4.3BSD
-option		FFS		# UFS
-option		FFS2		# UFS2
-option		NFSCLIENT	# Network File System client
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		UDF		# UDF (DVD) file system
-option		MSDOSFS		# MS-DOS file system
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
-option		DDB		# kernel debugger
-option		CRYPTO		# Cryptographic framework
-
-config		bsd	root on rd0a swap on rd0b
+option		FFS
+option		FFS2
+option		NFSCLIENT
+option		CD9660
+option		UDF
+option		MSDOSFS
+option		INET
+option		INET6
+option		CRYPTO
+
+config		bsd root on rd0a swap on rd0b
 
 mainbus0	at root
 softraid0	at root
 cpu0		at mainbus0
 
-mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
+mpcpcibr*	at mainbus0		# MPC106 PCI Bridge.
 memc*		at mainbus0
-openpic*	at memc?	# openpic interrupt controller
-kiic*           at memc?        # Keywest I2C
-pchb*		at pci?		# host bridge identifiers
+openpic*	at memc?		# openpic interrupt controller
+pchb*		at pci?			# host bridge identifiers
 ht*		at mainbus0
 smu*		at mainbus0
 
-#### PCI Bus devices.
-
 pci*		at mpcpcibr?
 pci*		at ht?
-ppb*		at pci?		# PCI-PCI bridges
+ppb*		at pci?			# PCI-PCI bridges
 pci*		at ppb?
 
+macobio0	at pci?
+macintr0	at macobio?		# old interrupt controller
+openpic*	at macobio?		# openpic interrupt controller
+
 siop*		at pci?
 fxp*		at pci?
 de*		at pci?
-#vme*		at pci?
-vgafb0		at pci?		# PCI VGA graphics
-#ep*		at pci?		# 3Com 3c59x
-#ne*		at pci?		# NE2000-compatible Ethernet
-#adv*		at pci?		# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
-ahc*		at pci?		# Adaptec 294x, aic78x0 SCSI
-#bha*		at pci?		# BusLogic 9xx SCSI
-pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
-qlw*		at pci?		# QLogic ISP SCSI
-qla*		at pci?		# QLogic ISP 2[123]xx FibreChannel
-qle*		at pci?		# QLogic ISP 2[45]xx FibreChannel
-mpi*		at pci?		# LSI Logic MPT-Fusion Message Passing Interface
-arc*		at pci?		# Areca RAID Controllers
+vgafb0		at pci?			# PCI VGA graphics
+ahc*		at pci?			# Adaptec 294x, aic78x0 SCSI
+pcscp*		at pci?			# AMD Am53c974 PCscsi-PCI SCSI
+qlw*		at pci?			# QLogic ISP SCSI
+qla*		at pci?			# QLogic ISP 2[123]xx FibreChannel
+qle*		at pci?			# QLogic ISP 2[45]xx FibreChannel
+mpi*		at pci?			# LSI Logic MPT-Fusion Message Passing Interface
+arc*		at pci?			# Areca RAID Controllers
 pciide*		at pci?
-kauaiata*	at pci?		# Apple ATA 100
+kauaiata*	at pci?			# Apple ATA 100
 wdc*		at kauaiata?
-macobio0	at pci?
-gem*		at pci?		# GMAC ethernet
-hme*		at pci?		# HME ethernet
-vge*		at pci?		# VIA VT612x
-dc*		at pci?		# DEC Tulip 21143 clones
-xl*		at pci?		# 3C9xx ethernet
-em*		at pci?		# Intel Pro/1000 ethernet
-#ixgb*		at pci?		# Intel Pro/10Gb ethernet
-epic*		at pci?		# SMC EPIC/100 ethernet
-bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
-ti*		at pci?		# Alteon Tigon 1Gb ethernet
-re*		at pci?		# Realtek 8169/8169S/8110S
-rl*		at pci?		# Realtek 81[23]9 ethernet
-stge*		at pci?		# Sundance TC9021 GigE
-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
-an*		at pci?		# Cisco/Aironet 802.11DS
-ath*		at pci?		# Atheros AR5k (802.11a/b/g)
-wi*		at pci?		# WaveLAN IEEE 802.11DS
-vr*		at pci?		# VIA Rhine ethernet
-pcn*		at pci?		# AMD PCnet-PCI Ethernet
-xge*		at pci?		# Neterion Xframe-I/II 10Gb ethernet
-ral*		at pci?		# Ralink RT2500/RT2501/RT2600
-
-# how many of these are needed?
-amphy*		at mii?		# AMD 79C873 PHYs
-dcphy*		at mii?		# Digital Clone PHYs
-acphy*		at mii?		# Altima AC101 PHYs
-exphy*		at mii?		# 3Com internal PHYs
-inphy*		at mii?		# Intel 82555 PHYs
-iophy*		at mii?		# Intel 82553 PHYs
-icsphy*		at mii?		# Integrated Circuit Systems ICS1890
-lxtphy*		at mii?		# Level One LXT-970 PHYs
-nsphy*		at mii?		# NS83840 PHYs
-#nsphyter*	at mii?		# NS83843 PHYs
-mtdphy*		at mii?		# Myson MTD972 PHYs
-qsphy*		at mii?		# Quality Semiconductor QS6612 PHYs
-luphy*		at mii?		# Lucent LU6612 PHY
-sqphy*		at mii?		# Seeq 80220/80221/80223 PHYs
-rlphy*		at mii?		# RealTek 8139 internal PHYs
-#tlphy*		at mii?		# ThunderLAN PHYs
-tqphy*		at mii?		# TDK Semiconductor PHYs
-brgphy*		at mii?		# Broadcom 10/100/1000 PHYs
-bmtphy*		at mii?		# Broadcom 10/100 PHYs
-eephy*		at mii?		# Marvell 88E1000 Gigabit PHYs
-xmphy*		at mii?		# XaQti XMAC-II PHYs
-urlphy*		at mii?		# Realtek RTL8150L internal PHY
-rgephy*		at mii?		# Realtek 8169S/8110S PHY
-rlphy*		at mii?		# Realtek 8139 internal PHYs
-ciphy*		at mii?		# Cicada CS8201 10/100/1000 copper PHY
-ipgphy*		at mii?		# IC Plus IP1000A PHYs
-ukphy*		at mii?		# generic unknown PHYs
-
-macintr0	at macobio?	# old interrupt controller
-openpic*	at macobio?	# openpic interrupt controller
-bm*		at macobio?	# bmac ethernet
-mc*		at macobio?	# MACE ethernet
-#esp*		at macobio? flags 0x0000ffff# 53c9x SCSI
+
+gem*		at pci?			# GMAC ethernet
+hme*		at pci?			# HME ethernet
+vge*		at pci?			# VIA VT612x
+dc*		at pci?			# DEC Tulip 21143 clones
+xl*		at pci?			# 3C9xx ethernet
+em*		at pci?			# Intel Pro/1000 ethernet
+epic*		at pci?			# SMC EPIC/100 ethernet
+bge*		at pci?			# Broadcom BCM570x (aka Tigon3)
+ti*		at pci?			# Alteon Tigon 1Gb ethernet
+re*		at pci?			# Realtek 8169/8169S/8110S
+rl*		at pci?			# Realtek 81[23]9 ethernet
+stge*		at pci?			# Sundance TC9021 GigE
+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
+an*		at pci?			# Cisco/Aironet 802.11DS
+ath*		at pci?			# Atheros AR5k (802.11a/b/g)
+wi*		at pci?			# WaveLAN IEEE 802.11DS
+vr*		at pci?			# VIA Rhine ethernet
+pcn*		at pci?			# AMD PCnet-PCI Ethernet
+xge*		at pci?			# Neterion Xframe-I/II 10Gb ethernet
+ral*		at pci?			# Ralink RT2500/RT2501/RT2600
+
+amphy*		at mii?			# AMD 79C873 PHYs
+dcphy*		at mii?			# Digital Clone PHYs
+acphy*		at mii?			# Altima AC101 PHYs
+exphy*		at mii?			# 3Com internal PHYs
+inphy*		at mii?			# Intel 82555 PHYs
+iophy*		at mii?			# Intel 82553 PHYs
+icsphy*		at mii?			# Integrated Circuit Systems ICS1890
+lxtphy*		at mii?			# Level One LXT-970 PHYs
+nsphy*		at mii?			# NS83840 PHYs
+mtdphy*		at mii?			# Myson MTD972 PHYs
+qsphy*		at mii?			# Quality Semiconductor QS6612 PHYs
+luphy*		at mii?			# Lucent LU6612 PHY
+sqphy*		at mii?			# Seeq 80220/80221/80223 PHYs
+rlphy*		at mii?			# RealTek 8139 internal PHYs
+tqphy*		at mii?			# TDK Semiconductor PHYs
+brgphy*		at mii?			# Broadcom 10/100/1000 PHYs
+bmtphy*		at mii?			# Broadcom 10/100 PHYs
+eephy*		at mii?			# Marvell 88E1000 Gigabit PHYs
+xmphy*		at mii?			# XaQti XMAC-II PHYs
+urlphy*		at mii?			# Realtek RTL8150L internal PHY
+rgephy*		at mii?			# Realtek 8169S/8110S PHY
+rlphy*		at mii?			# Realtek 8139 internal PHYs
+ciphy*		at mii?			# Cicada CS8201 10/100/1000 copper PHY
+ipgphy*		at mii?			# IC Plus IP1000A PHYs
+ukphy*		at mii?			# generic unknown PHYs
+
+bm*		at macobio?		# bmac ethernet
+mc*		at macobio?		# MACE ethernet
 mesh*		at macobio? flags 0xffff# MESH SCSI
-#nvram*		at macobio?	# nvram
-adb*		at macobio?	# Apple Desktop Bus
-wi*		at macobio?	# Apple Airport 802.11DS
-macgpio*	at macobio?	# GPIO, PMU interrupt router.
-macgpio*	at macgpio?	# GPIO, PMU interrupt router.
-akbd*		at adb?		# ADB keyboard
+adb*		at macobio?		# Apple Desktop Bus
+wi*		at macobio?		# Apple Airport 802.11DS
+macgpio*	at macobio?		# GPIO, PMU interrupt router.
+macgpio*	at macgpio?		# GPIO, PMU interrupt router.
+akbd*		at adb?			# ADB keyboard
 wskbd*		at akbd? mux 1
-#ams*		at adb?		# ADB mouse
-#wsmouse*	at ams? mux 0
-#abtn*		at adb?		# ADB button?
 zsc*		at macobio?
 zstty*		at zsc?
 
-
 mediabay*	at macobio?
 wdc*		at mediabay?
 wdc*		at macobio?
@@ -147,14 +131,12 @@ wd*		at pciide?
 atapiscsi*	at wdc? flags 0x0000
 atapiscsi*	at pciide? flags 0x0000
 
-# USB Controllers
-ohci*		at pci?		# Open Host Controller
-ohci*		at cardbus?	# Open Host Controller
-uhci*		at pci?		# Universal Host Controller
-ehci*		at pci?		# Enhanced Host Controller
-ehci*		at cardbus?	# Enhanced Host Controller
+ohci*		at pci?
+ohci*		at cardbus?
+uhci*		at pci?
+ehci*		at pci?
+ehci*		at cardbus?
 
-# USB bus support
 usb*		at ohci?
 usb*		at uhci?
 usb*		at ehci?
@@ -164,9 +146,6 @@ uhub*		at uhub?
 uhidev*		at uhub?
 uhid*		at uhidev?		# USB Generic HID devices
 ukbd*		at uhidev?		# USB HID Keyboard devices
-#ums*		at uhub?		# USB Mice
-#wsmouse*	at ums? mux 0
-#ulpt*		at uhub?		# USB Printer
 aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
 axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
 axen*		at uhub?		# ASIX Electronics AX88179 USB Ethernet
@@ -175,7 +154,7 @@ kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
 smsc*		at uhub?		# SMSC LAN95xx Ethernet
 cdce*		at uhub?		# CDC Ethernet
 upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
-ugl*		at uhub?		# Genesys Logic GL620A-USB host-to-host
+ugl*		at uhub?		# Genesys Logic GL620USB-A host-to-host
 udav*		at uhub?		# Davicom DM9601 based Ethernet
 mos*		at uhub?		# MOSCHIP MCS7730/7830 10/100 Ethernet
 ural*		at uhub?		# Ralink RT2500
@@ -184,30 +163,8 @@ urtwn*		at uhub?		# Realtek RTL8188CU/RTL8192CU
 zyd*		at uhub?		# Zydas ZD1211
 url*		at uhub?		# Realtek RTL8150L based adapters
 wi*		at uhub?		# WaveLAN IEEE 802.11DS
-#ugen*		at uhub?		# USB Generic driver
-umass*		at uhub?		# USB Mass Storage devices
-
-# I2C bus support
-iic*		at kiic?
-#iic*		at piic?
-#iic*		at smu?
-
-# I2C devices
-#lmtemp*		at iic?
-#lmenv*		at iic?
-#maxtmp*		at iic?
-#adc*		at iic?
-#tsl*		at iic?
-#admtmp*		at iic?
-#pcagpio*	at iic?
-#gpio*		at pcagpio?
-#maxds*		at iic?
-fcu*		at iic?
-#adt*		at iic?
-#asms*		at iic?
-#spdmem*		at mem?
-
-# CardBus bus support
+umass*		at uhub?
+
 cardbus*	at cardslot?
 pcmcia*		at cardslot?
 cbb*		at pci?
@@ -229,18 +186,10 @@ scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
-#ch*		at scsibus?
-#uk*		at scsibus?
-
-pseudo-device	loop	1	# network loopback
-pseudo-device	bpfilter 1	# packet filter
-pseudo-device	vlan		# IEEE 802.1Q VLAN 
-pseudo-device	rd	1	# ram disk
-pseudo-device	wsmux	2	# mouse & keyboard multiplexor
-pseudo-device	bio	1	# ioctl multiplexing device
 
-option		BOOT_CONFIG	# boot-time kernel config
-
-# RAMDISK stuff
-option		MINIROOTSIZE=8192
-option		RAMDISK_HOOKS
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	vlan
+pseudo-device	rd 1
+pseudo-device	wsmux 2
+pseudo-device	bio 1