Index: head/sys/mips/conf/BERI_TEMPLATE
===================================================================
--- head/sys/mips/conf/BERI_TEMPLATE	(revision 314046)
+++ head/sys/mips/conf/BERI_TEMPLATE	(nonexistent)
@@ -1,65 +0,0 @@
-#
-# BERI_TEMPLATE -- a template kernel configuration for the SRI/Cambridge
-# "BERI" (Bluespec Extensible RISC Implementation) FPGA soft core CPU.  This
-# kernel configuration file will be included by other board-specific files,
-# and so contains only BERI features common across all board targets.
-#
-# $FreeBSD$
-#
-
-ident		BERI_TEMPLATE
-
-machine		mips mips64
-
-cpu		CPU_BERI
-
-options 	HZ=200
-
-makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-
-makeoptions 	KERNLOADADDR=0xffffffff80100000
-
-include		"../beri/std.beri"
-
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-
-makeoptions	MODULES_OVERRIDE=""
-
-options 	DDB
-options 	KDB
-options 	ALT_BREAK_TO_DEBUGGER
-options 	KTRACE
-
-options 	CAPABILITY_MODE
-options 	CAPABILITIES
-
-options 	COMPAT_FREEBSD10
-options 	COMPAT_FREEBSD11
-
-options 	SCHED_ULE
-
-options 	FFS			#Berkeley Fast Filesystem
-
-options 	INET
-options 	INET6
-options 	TCP_HHOOK		# hhook(9) framework for TCP
-options 	KGSSAPI
-options 	NFSCL
-options 	NFSLOCKD
-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
-
-device		crypto
-device		cryptodev
-device		ether
-device		geom_map
-device		loop
-device		md
-device		random
-device		snp

Property changes on: head/sys/mips/conf/BERI_TEMPLATE
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/sys/mips/conf/BERI_DE4_BASE
===================================================================
--- head/sys/mips/conf/BERI_DE4_BASE	(revision 314046)
+++ head/sys/mips/conf/BERI_DE4_BASE	(revision 314047)
@@ -1,52 +1,52 @@
 #
 # BERI_DE4_BASE -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC
 # Implementation) FPGA soft core, as configured in its Terasic DE-4 reference
 # configuration.  This kernel configration must be further specialized to
 # to include a root filesystem specification.
 #
 # $FreeBSD$
 #
 
-include "BERI_TEMPLATE"
+include "std.BERI"
 
 ident		BERI_DE4_BASE
 
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 
 options         FDT
 options         FDT_DTB_STATIC
 makeoptions     FDT_DTS_FILE=beripad-de4.dts
 
 hints		"BERI_DE4.hints"	# Flash partitions still use hints.
 
 device		altera_atse
 device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
 device		terasic_de4led
 device		terasic_mtl
 
 device		bpf
 device		cfi
 device		cfid
 options 	CFI_SUPPORT_STRATAFLASH
 options 	ATSE_CFI_HACK
 device		vt
 device		kbdmux
 
 device		uart
 
 device		miibus
 options 	DEVICE_POLLING
 
 #
 # USB support
 #
 #options	USB_DEBUG
 #options	USB_REQ_DEBUG
 #options	USB_VERBOSE
 device		usb
 device		saf1761otg
 
Index: head/sys/mips/conf/BERI_NETFPGA_MDROOT
===================================================================
--- head/sys/mips/conf/BERI_NETFPGA_MDROOT	(revision 314046)
+++ head/sys/mips/conf/BERI_NETFPGA_MDROOT	(revision 314047)
@@ -1,37 +1,37 @@
 #
 # BERI_NETFPGA_MDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
 # RISC Implementation) FPGA soft core, as configured in its NetFPGA reference
 # configuration.
 #
 # $FreeBSD$
 #
 
-include "BERI_TEMPLATE"
+include "std.BERI"
 
 ident		BERI_NETFPGA_MDROOT
 
 options 	HZ=100
 
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=beri-netfpga.dts
 
 #device		uart
 device		altera_jtag_uart
 
 device		bpf
 
 options 	DEVICE_POLLING
 device		netfpga10g_nf10bmac
 options 	NF10BMAC_64BIT
 
 #
 # This kernel configuration uses an embedded memory root file system.
 # Adjust the following path and size based on local requirements.
 #
 options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=26112	# 25.5MB
 options 	ROOTDEVNAME=\"ufs:md0\"
 #makeoptions	MFS_IMAGE=/foo/baz/baz/mdroot.img
 
 # end
Index: head/sys/mips/conf/BERI_SIM_BASE
===================================================================
--- head/sys/mips/conf/BERI_SIM_BASE	(revision 314046)
+++ head/sys/mips/conf/BERI_SIM_BASE	(revision 314047)
@@ -1,19 +1,19 @@
 #
 # BERI_SIM_BASE -- Base kernel for the SRI/Cambridge "BERI" (Bluespec
 # Extensible RISC Implementation) FPGA soft core, as configured for
 # simulation.
 #
 # $FreeBSD$
 #
 
-include "BERI_TEMPLATE"
+include "std.BERI"
 
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=beri-sim.dts
 
 options 	ALTERA_SDCARD_FAST_SIM
 
 device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
Index: head/sys/mips/conf/BERI_SOCKIT
===================================================================
--- head/sys/mips/conf/BERI_SOCKIT	(revision 314046)
+++ head/sys/mips/conf/BERI_SOCKIT	(revision 314047)
@@ -1,26 +1,26 @@
 #
 # BERI_SOCKIT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
 # RISC Implementation) FPGA soft core, as configured in its Terasic SoCKit
 # reference configuration.  This kernel configration must be further
 # specialized to to include a root filesystem specification.
 #
 # $FreeBSD$
 #
 
-include "BERI_TEMPLATE"
+include "std.BERI"
 
 ident		BERI_SOCKIT
 
 options 	ROOTDEVNAME=\"ufs:vtbd0\"
 
 device		altera_pio
 device		altera_jtag_uart
 
 device		virtio
 device		virtio_blk
 device		vtnet
 device		virtio_mmio
 
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=beripad-sockit.dts
Index: head/sys/mips/conf/std.BERI
===================================================================
--- head/sys/mips/conf/std.BERI	(nonexistent)
+++ head/sys/mips/conf/std.BERI	(revision 314047)
@@ -0,0 +1,63 @@
+#
+# BERI_TEMPLATE -- a template kernel configuration for the SRI/Cambridge
+# "BERI" (Bluespec Extensible RISC Implementation) FPGA soft core CPU.  This
+# kernel configuration file will be included by other board-specific files,
+# and so contains only BERI features common across all board targets.
+#
+# $FreeBSD$
+#
+
+machine		mips mips64
+
+cpu		CPU_BERI
+
+options 	HZ=200
+
+makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
+
+makeoptions 	KERNLOADADDR=0xffffffff80100000
+
+include		"../beri/std.beri"
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+
+makeoptions	MODULES_OVERRIDE=""
+
+options 	DDB
+options 	KDB
+options 	ALT_BREAK_TO_DEBUGGER
+options 	KTRACE
+
+options 	CAPABILITY_MODE
+options 	CAPABILITIES
+
+options 	COMPAT_FREEBSD10
+options 	COMPAT_FREEBSD11
+
+options 	SCHED_ULE
+
+options 	FFS			#Berkeley Fast Filesystem
+
+options 	INET
+options 	INET6
+options 	TCP_HHOOK		# hhook(9) framework for TCP
+options 	KGSSAPI
+options 	NFSCL
+options 	NFSLOCKD
+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
+
+device		crypto
+device		cryptodev
+device		ether
+device		geom_map
+device		loop
+device		md
+device		random
+device		snp

Property changes on: head/sys/mips/conf/std.BERI
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property