scrub scrub scrub

2 files changed, 27 insertions, 60 deletions

diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 860fdd200fe..af84b7c0138 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.13 2005/01/14 17:52:25 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.14 2005/01/14 18:09:07 drahn Exp $
 #
 # GENERIC machine description file
 #
@@ -39,25 +39,12 @@ makeoptions	BOARDTYPE="zaurus"
 
 maxusers	32
 
-# Standard system options
-
-#options 	UCONSOLE	# users can use TIOCCONS (for xconsole)
-#options 	INSECURE	# disable kernel securelevel
-
-#options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
-#options 	NTP		# NTP phase/frequency locked loop
-
 # CPU options
 options 	CPU_XSCALE_PXA2X0	# Support the XScale core
 options 	XSCALE_CACHE_WRITE_THROUGH
 #options 	XSCALE_CACHE_WRITE_BACK
 makeoptions	CPUFLAGS="-mcpu=xscale"
 
-
-# FPA options
-
-#options 	ARMFPE		# ARM Ltd FPE
-
 #option WSDISPLAY_COMPAT_USL		# VT handling
 #option WSDISPLAY_COMPAT_RAWKBD		# can get raw scancoetes
 option WSDISPLAY_DEFAULTSCREENS=2
@@ -132,15 +119,13 @@ cd*		at scsibus?
 #ss*		at scsibus?
 #uk*		at scsibus?
 
-# cotulla integrated 16550 UARTs
+# integrated 16550 UARTs
 options COM_PXA2X0
-com0	at pxaip?  addr 0x40100000 intr 22      # Full Function UART
-com1	at pxaip?  addr 0x40200000 intr 21 	# BlueTootth UART
+com0	at pxaip?  addr 0x40100000 intr 22	# Full Function UART
+com1	at pxaip?  addr 0x40200000 intr 21	# BlueTootth UART
 #com2	at pxaip?  addr 0x40700000 intr 20	# Standard UART (for IrDA)
 options FFUARTCONSOLE
 #options BTUARTCONSOLE
-options KGDB_DEVNAME="\"btuart\""   # ffuart or btuart
-options KGDB_DEVRATE=115200
 
 #aupxa0	at pxaip?		# AC97 interface
 
@@ -181,13 +166,7 @@ urlphy*	at mii?			# Realtek RTL8150L internal PHY
 #ciphy* at mii?			# Cicada CS8201 10/100/1000 copper PHY
 ukphy*	at mii?			# "unknown" PHYs
 
-# On-board device support
-#obio0		at pxaip? intr 8
-#sm0		at obio? addr 0x0c000000 intr 3 	# on-board SMC 91C96
-#options LUBBOCK_SMC91C96_16BIT
-
 # LCD
-#lcd0		at obio?
 lcd0		at pxaip?
 wsdisplay*	at lcd? console ?
 options 	WSEMUL_VT100		# VT100 / VT220 emulation
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index e82a3fa45c9..b2c3cb1fae0 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.11 2005/01/14 00:39:20 drahn Exp $
+#	$OpenBSD: RAMDISK,v 1.12 2005/01/14 18:09:07 drahn Exp $
 # $NetBSD: GENERIC,v 1.27.4.1 2002/08/01 04:18:06 lukem Exp $
 #
 # GENERIC machine description file
@@ -22,17 +22,17 @@
 machine	zaurus	arm
 
 # include "../../../conf/GENERIC"
-option		TIMEZONE=0	# time zone to adjust RTC time by
-option		DST=0		# daylight saving time used by RTC
-option		FFS		# UFS
-#option		NFSCLIENT	# Network File System client
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		MSDOSFS		# MS-DOS file system
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
-option		DDB		# kernel debugger
-option		EXT2FS		# Second Extended Filesystem
-option		FIFO		# FIFOs; RECOMMENDED
+options	TIMEZONE=0	# time zone to adjust RTC time by
+options	DST=0		# daylight saving time used by RTC
+options	FFS		# UFS
+#options	NFSCLIENT	# Network File System client
+options	CD9660		# ISO 9660 + Rock Ridge file system
+options	MSDOSFS		# MS-DOS file system
+options	INET		# IP + ICMP + TCP + UDP
+options	INET6		# IPv6 (needs INET)
+options	DDB		# kernel debugger
+options	EXT2FS		# Second Extended Filesystem
+options	FIFO		# FIFOs; RECOMMENDED
 
 options		ARM32
 #options 	ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
@@ -51,26 +51,16 @@ makeoptions	BOARDTYPE="zaurus"
 
 maxusers	32
 
-# Standard system options
-
-#options 	UCONSOLE	# users can use TIOCCONS (for xconsole)
-#options 	INSECURE	# disable kernel securelevel
-
-#options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
-#options 	NTP		# NTP phase/frequency locked loop
-
-# CPU options
-
-# For StrongARM systems
 # CPU options
 options 	CPU_XSCALE_PXA2X0	# Support the XScale core
 options 	XSCALE_CACHE_WRITE_THROUGH
 #options 	XSCALE_CACHE_WRITE_BACK
 makeoptions	CPUFLAGS="-mcpu=xscale"
 
-# FPA options
-
-#options 	ARMFPE		# ARM Ltd FPE
+#option WSDISPLAY_COMPAT_USL		# VT handling
+#option WSDISPLAY_COMPAT_RAWKBD		# can get raw scancoetes
+#option WSDISPLAY_DEFAULTSCREENS=2
+#option WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
 
 config		bsd	root on rd0a swap on rd0b
 
@@ -125,19 +115,17 @@ cd*		at scsibus?
 #ss*		at scsibus?
 #uk*		at scsibus?
 
-# cotulla integrated 16550 UARTs
+# integrated 16550 UARTs
 options COM_PXA2X0
 com0	at pxaip?  addr 0x40100000 intr 22	# Full Function UART
-com1	at pxaip?  addr 0x40200000 intr 21 	# BlueTootth UART
+com1	at pxaip?  addr 0x40200000 intr 21	# BlueTootth UART
 #com2	at pxaip?  addr 0x40700000 intr 20	# Standard UART (for IrDA)
 options FFUARTCONSOLE
 #options BTUARTCONSOLE
-options KGDB_DEVNAME="\"btuart\""   # ffuart or btuart
-options KGDB_DEVRATE=115200
 
 #aupxa0	at pxaip?		# AC97 interface
 
-# pcic
+# CF (pcmcia) support
 pxapcic0	at pxaip?
 pcmcia*		at pxapcic?
 wi*		at pcmcia?
@@ -170,7 +158,7 @@ bmtphy*	at mii?			# Broadcom 10/100 PHYs
 nsgphy*	at mii?			# NS gigabit PHYs
 urlphy*	at mii?			# Realtek RTL8150L internal PHY
 #rgephy* at mii?		# Realtek 8169S/8110S PHY
-#ciphy*  at mii?		# Cicada CS8201 10/100/1000 copper PHY
+#ciphy* at mii?			# Cicada CS8201 10/100/1000 copper PHY
 ukphy*	at mii?			# "unknown" PHYs
 
 
@@ -186,8 +174,8 @@ pseudo-device	loop		1	# network loopback
 pseudo-device	bpfilter	1	# packet filter
 pseudo-device	rd		1	# ram disk
 
-option		BOOT_CONFIG	# boot-time kernel config
+options	BOOT_CONFIG	# boot-time kernel config
 
 # RAMDISK stuff
-option		MINIROOTSIZE=5120
-option		RAMDISK_HOOKS
+options	MINIROOTSIZE=5120
+options	RAMDISK_HOOKS