PERFORCE change 130734 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=130734

Change 130734 by marcel at marcel_jnpr on 2007/12/12 21:08:25

	Sync with my current configuration file.

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/conf/XSERVE#3 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/conf/XSERVE#3 (text+ko) ====

@@ -1,75 +1,75 @@
 cpu		OEA
 ident		XSERVE
 
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g
 makeoptions	NO_MODULES=yes
 
-options 	POWERMAC		#NewWorld Apple PowerMacs
-
+options 	ALT_BREAK_TO_DEBUGGER
+options 	CD9660
+options 	DDB
+options 	FFS
+options 	GDB
+options 	GEOM_PART_GPT
+options 	INET
+options 	INET6
+#options 	INTR_FILTER
+options 	INVARIANTS
+options 	INVARIANT_SUPPORT
+options 	KDB
+options 	KTRACE
+options 	MSDOSFS
+options 	NFSCLIENT
+options 	P1003_1B_SEMAPHORES
+options 	POWERMAC
+options 	PROCFS
+options 	PSEUDOFS
+options 	SCHED_4BSD
+#options 	SCHED_ULE
+options 	SCSI_DELAY=3000
 options 	SMP
-options 	SCHED_4BSD		#4BSD scheduler
-options 	INET			#InterNETworking
-options 	INET6			#IPv6 communications protocols
-options 	FFS			#Berkeley Fast Filesystem
-options 	SOFTUPDATES		#Enable FFS soft updates support
-options 	UFS_ACL			#Support for access control lists
-options 	UFS_DIRHASH		#Improve performance on big directories
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as root device
-options 	MSDOSFS			#MSDOS Filesystem
-options 	CD9660			#ISO 9660 Filesystem
-options 	PROCFS			#Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	GEOM_PART_GPT		#GUID Partition Tables.
-options 	COMPAT_43TTY		#BSD 4.3 TTY compat [KEEP THIS!]
-options 	SCSI_DELAY=5000		#Delay (in ms) before probing SCSI 
-options 	KTRACE			#ktrace(1) syscall trace support
-options 	SYSVSHM			#SYSV-style shared memory
-options 	SYSVMSG			#SYSV-style message queues
-options 	SYSVSEM			#SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options 	SOFTUPDATES
+options 	SYSVMSG
+options 	SYSVSEM
+options 	SYSVSHM
+options 	UFS_DIRHASH
+options 	WITNESS
+options 	WITNESS_KDB
+options 	WITNESS_SKIPSPIN
+options 	_KPOSIX_PRIORITY_SCHEDULING
 
-options 	KDB			#Enable the kernel debugger
-options 	GDB			#Support GDB
-options 	DDB			#Support DDB
-
+device		ata
+device		atadisk
+device		atapicd
+device		bge
+device		bpf
+device		da
+device		ether
+device		firewire
+device		gem
+device		loop
+device		md
+device		miibus
+device		ohci
+device		pass
 device		pci
-
-device		ata
-device		atadisk		# ATA disk drives
-device		atapicd		# ATAPI CDROM drives
+device		powermac_nvram
+device		pty
+device		puc
+device		random
+device		sbp
+device		scbus
+device		scc
+device		tun
+device		uart
+device		ugen
+device		uhid
+device		ukbd
+device		umass
+device		ums
+device		usb
 
 device		sc
 device		kbdmux
-options		SC_OFWFB	# OFW frame buffer
-options		SC_DFLT_FONT	# compile font in
+options 	SC_OFWFB        # OFW frame buffer
+options 	SC_DFLT_FONT
 makeoptions	SC_DFLT_FONT=cp437
-
-device		scc
-device		uart
-
-device		miibus		# MII bus support
-device		gem		# Sun GEM/Sun ERI/Apple GMAC
-#device		bge
-
-device		loop		# Network loopback
-device		random		# Entropy device
-device		ether		# Ethernet support
-device		tun		# Packet tunnel.
-device		pty		# Pseudo-ttys (telnet etc)
-device		md		# Memory "disks"
-device		ofwd		# Open Firmware disks
-
-device		bpf		#Berkeley packet filter
-
-device		ohci		# OHCI PCI->USB interface
-device		usb		# USB Bus (required)
-device		ugen		# Generic
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
-options         KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device		ums		# Mouse
-
-device		firewire	# FireWire bus code
-
-device		powermac_nvram