PERFORCE change 29880 for review

[David E. O'Brien]

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

Change 29880 by obrien at obrien_trang on 2003/04/27 09:46:08

	sync layout with i386/GENERIC so we can more easily see what's present
	and what's missing.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/conf/GENERIC#11 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#11 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.368 2002/10/13 16:29:15 mike Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $
 
 machine		x86_64
 cpu		HAMMER
@@ -25,41 +25,29 @@
 
 makeoptions	NO_MODULES=not_yet
 
-options 	INET
-options		SCHED_4BSD
-options 	FFS
-options		SOFTUPDATES
-options 	MD_ROOT
-device	isa
-device	sio
+#To statically compile in device wiring instead of /boot/device.hints
+#hints		"GENERIC.hints"		#Default places to look for devices.
 
-options	INVARIANTS
-options INVARIANT_SUPPORT
+options 	SCHED_4BSD		#4BSD scheduler
+options 	INET			#InterNETworking
+options 	FFS			#Berkeley Fast Filesystem
+options 	SOFTUPDATES		#Enable FFS soft updates support
+options 	MD_ROOT			#MD is a potential root device
+options 	NFSCLIENT		#Network Filesystem Client
+options 	NFS_ROOT		#NFS usable as root device, requires NFSCLIENT
 
-device	pci
-device	miibus
-device	bge
-device	fxp
-device	xl
+# Debugging for use in -current
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 
-device		random		# Entropy device
-device	loop
-device	ether
-device	md
+device		isa
+device		pci
 
-device	ata
-device	atadisk
-device	atapicd			# ATAPI CDROM drives
+# ATA and ATAPI devices
+device		ata
+device		atadisk			# ATA disk drives
+device		atapicd			# ATAPI CDROM drives
 
-# USB support
-#device          uhci            # UHCI PCI->USB interface
-#device          ohci            # OHCI PCI->USB interface
-#device          usb             # USB Bus (required)
-#device          ugen            # Generic
-#device          uhid            # "Human Interface Devices"
-#device          ukbd            # Keyboard
-
-
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 #device		atkbdc		# AT keyboard controller
 #device		atkbd		# AT keyboard
@@ -74,7 +62,31 @@
 
 #device		agp		# support several AGP chipsets
 
+# Serial (COM) ports
+device		sio		# 8250, 16[45]50 based serial ports
+
 # Parallel port
 #device		ppc
 #device		ppbus		# Parallel port bus (required)
 #device		lpt		# Printer
+
+# PCI Ethernet NICs that use the common MII bus controller code.
+# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
+device		miibus		# MII bus support
+device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device		bge		# Broadcom BCM570xx Gigabit Ethernet
+
+# Pseudo devices - the number indicates how many units to allocate.
+device		random		# Entropy device
+device		loop		# Network loopback
+device		ether		# Ethernet support
+device		md		# Memory "disks"
+
+# USB support
+#device          uhci            # UHCI PCI->USB interface
+#device          ohci            # OHCI PCI->USB interface
+#device          usb             # USB Bus (required)
+#device          ugen            # Generic
+#device          uhid            # "Human Interface Devices"
+#device          ukbd            # Keyboard