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, 40 insertions, 51 deletions

diff --git a/sys/arch/socppc/conf/RAMDISK b/sys/arch/socppc/conf/RAMDISK
index 03b49de0665..416ef215fd5 100644
--- a/sys/arch/socppc/conf/RAMDISK
+++ b/sys/arch/socppc/conf/RAMDISK
@@ -1,91 +1,80 @@
-#	$OpenBSD: RAMDISK,v 1.9 2011/06/29 20:52:09 matthew Exp $
+#	$OpenBSD: RAMDISK,v 1.10 2014/10/10 05:43:35 deraadt Exp $
 
 machine		socppc powerpc
+maxusers	4
 
-maxusers	32			# estimated number of users
+option		TIMEZONE=0
+option		DST=0
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		BOOT_CONFIG
+
+option		MINIROOTSIZE=8192
+option		RAMDISK_HOOKS
 
 option		PCIVERBOSE
 option		USBVERBOSE
 
-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		FFS
+option		FFS2
+option		NFSCLIENT
+option		CD9660
+option		UDF
+option		MSDOSFS
+option		INET
+option		INET6
 
-config		bsd	root on rd0a swap on rd0b
+config		bsd root on rd0a swap on rd0b
 
 mainbus0	at root
 cpu0		at mainbus0
 obio0		at mainbus0
+ipic0		at obio?
 
-# On-board CF
-wdc0		at mainbus0
+wdc0		at mainbus0		# On-board CF
 wdc1		at mainbus0
 wd*		at wdc? flags 0x0000
 
-# On-board IPIC
-ipic0		at obio?
-
-# On-board I2C
 sociic0		at obio?
 sociic1		at obio?
 iic*		at sociic?
 ricohrtc0	at iic? addr 0x32	# Ricoh RTC
 fintek0		at iic?	flags 0x0001	# temp/fan controller
 
-# On-board DUART
 com0		at obio?
 com1		at obio?
 
-# On-board PCI
 socpcic*	at mainbus?
 socpcic*	at obio?
-pci*		at socpcic?
+tsec0		at obio?
+tsec1		at obio?
 
+pci*		at socpcic?
 pciide*		at pci?
 wd*		at pciide? flags 0x0000
 
-vge*		at pci?
-
-# On-board USB
 ehci0		at obio?
 usb*		at ehci?
 
-# USB devices
-uhub*	at usb?			# USB Hubs
-uhub*	at uhub?		# USB Hubs
-umass*	at uhub?		# USB Mass Storage devices
-ural*	at uhub?		# Ralink RT2500USB
-rum*	at uhub?		# Ralink RT2501USB/RT2601USB
-zyd*	at uhub?		# Zydas ZD1211
+uhub*		at usb?
+uhub*		at uhub?
+umass*		at uhub?
+ural*		at uhub?		# Ralink RT2500USB
+rum*		at uhub?		# Ralink RT2501USB/RT2601USB
+zyd*		at uhub?		# Zydas ZD1211
 
 scsibus*	at scsi?
 sd*		at scsibus?
 
-# On-board TSEC
-tsec0		at obio?
-tsec1		at obio?
-
-rgephy*		at mii?		# Realtek 8169S/8110S PHY
-eephy*		at mii?		# Marvell 88E1000 series PHY
-ciphy*		at mii?		# Cicada CS8201 10/100/1000 copper PHY
-gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
-ukphy*		at mii?		# Generic unknown PHY
-
-# PCI
-athn*		at pci?		# Atheros AR9k (802.11a/g/n)
-
-pseudo-device	loop	1	# network loopback
-pseudo-device	bpfilter 1	# packet filter
-pseudo-device	rd	1	# ram disk
+vge*		at pci?
+athn*		at pci?			# Atheros AR9k (802.11a/g/n)
 
-option		BOOT_CONFIG	# boot-time kernel config
+rgephy*		at mii?			# Realtek 8169S/8110S PHY
+eephy*		at mii?			# Marvell 88E1000 series PHY
+ciphy*		at mii?			# Cicada CS8201 10/100/1000 copper PHY
+gentbi*		at mii?			# Generic 1000BASE-X ten-bit PHY
+ukphy*		at mii?			# Generic unknown PHY
 
-# RAMDISK stuff
-option          MINIROOTSIZE=8192
-option          RAMDISK_HOOKS
+pseudo-device	loop 1
+pseudo-device	bpfilter 1
+pseudo-device	rd 1