PERFORCE change 212863 for review

[Robert Watson]

http://p4web.freebsd.org/@@212863?ac=10

Change 212863 by rwatson at rwatson_svr_ctsrd_mipsbuild on 2012/06/14 21:36:03

	Factor out common, non-DE4-specific portions of the BERI DE4
	MDROOT and SDROOT kernel configuration files into a new
	BERI_TEPLATE configuratio file incuded by both, and also
	appropriatate to use with future tPad configurations.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#4 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_TEMPLATE#1 add

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#4 (text+ko) ====

@@ -6,46 +6,12 @@
 # $FreeBSD$
 #
 
+include "BERI_TEMPLATE"
+
 ident		BERI_DE4_MDROOT
 
-machine		mips mips64eb
-
-cpu		CPU_BERI
-
-options 	HZ=200
-
-makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-
-makeoptions 	KERNLOADADDR=0xffffffff80100000
-
-include		"../beri/std.beri"
-
 hints		"BERI_DE4.hints"	#Default places to look for devices.
 
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-
-makeoptions	MODULES_OVERRIDE=""
-
-options 	DDB
-options 	KDB
-options 	ALT_BREAK_TO_DEBUGGER
-
-options 	SCHED_ULE
-
-options 	FFS			#Berkeley Fast Filesystem
-
-options 	INET
-options 	INET6
-options 	NFSCL
-options 	NFS_ROOT
-
-# Debugging for use in -current
-#options 	DEADLKRES		#Enable the deadlock resolver
-options 	INVARIANTS		#Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-#options 	WITNESS			#Enable checks to detect deadlocks and cycles
-#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-
 #
 # This kernel configuration uses an embedded 8MB memory root file system.
 # Adjust the following path based on local requirements.
@@ -62,11 +28,4 @@
 device		terasic_mtl
 
 device		isf
-device		geom_map
-
-device		md
-device		ether
-device		loop
-device		random
 device		sc
-device		snp

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#5 (text+ko) ====

@@ -6,45 +6,12 @@
 # $FreeBSD$
 #
 
+include "BERI_TEMPLATE"
+
 ident		BERI_DE4_SDROOT
 
-machine		mips mips64eb
-
-cpu		CPU_BERI
-
-options 	HZ=200
-makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-
-makeoptions 	KERNLOADADDR=0xffffffff80100000
-
-include		"../beri/std.beri"
-
 hints		"BERI_DE4.hints"	#Default places to look for devices.
 
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-
-makeoptions	MODULES_OVERRIDE=""
-
-options 	DDB
-options 	KDB
-options 	ALT_BREAK_TO_DEBUGGER
-
-options 	SCHED_ULE
-
-options 	FFS			#Berkeley Fast Filesystem
-
-options 	INET
-options 	INET6
-options 	NFSCL
-options 	NFS_ROOT
-
-# Debugging for use in -current
-#options 	DEADLKRES		#Enable the deadlock resolver
-options 	INVARIANTS		#Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-#options 	WITNESS			#Enable checks to detect deadlocks and cycles
-#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-
 options 	ROOTDEVNAME=\"ufs:altera_sdcard0\"
 
 device		altera_avgen
@@ -54,11 +21,4 @@
 device		terasic_mtl
 
 device		isf
-device		geom_map
-
-device		md
-device		ether
-device		loop
-device		random
 device		sc
-device		snp