Refactor common options from MALTA and MALTA64 kernel

configs into MALTA_COMMON file.

3 files changed, 63 insertions, 131 deletions

diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA
index 4a0684d..6e9e49c 100644
--- a/sys/mips/conf/MALTA
+++ b/sys/mips/conf/MALTA
@@ -1,71 +1,11 @@
 # MALTA -- Kernel config for MALTA boards
 #
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
-#
-#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files. 
-# If you are in doubt as to the purpose or necessity of a line, check first 
-# in NOTES.
-#
 # $FreeBSD$
-
+ 
 ident		MALTA
 
+include		"MALTA_COMMON"
+ 
 machine		mips mipsel	# Malta supports both, so it isn't in std.malta
-
+ 
 makeoptions	KERNLOADADDR=0x80100000
-
-options 	YAMON
-
-# Don't build any modules yet.
-makeoptions	MODULES_OVERRIDE=""
-
-options 	TICK_USE_YAMON_FREQ=defined
-#options 	TICK_USE_MALTA_RTC=defined
-
-include		"../malta/std.malta"
-
-hints		"MALTA.hints"		#Default places to look for devices.
-
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-
-options 	DDB
-options 	KDB
-
-options 	SCHED_4BSD		#4BSD scheduler
-options 	INET			#InterNETworking
-options 	NFSCL			#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCL
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-
-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 	ROOTDEVNAME=\"ufs:ada0\"
-
-
-# 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		loop
-device		ether
-device		le
-device		miibus
-device		bpf
-device		md
-device		uart
-device		random
diff --git a/sys/mips/conf/MALTA64 b/sys/mips/conf/MALTA64
index 53c6298..c537fa6 100644
--- a/sys/mips/conf/MALTA64
+++ b/sys/mips/conf/MALTA64
@@ -1,73 +1,13 @@
-# MALTA -- Kernel config for MALTA boards
-#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
-#
-#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files. 
-# If you are in doubt as to the purpose or necessity of a line, check first 
-# in NOTES.
+# MALTA64 -- 64-bit kernel config for MALTA boards
 #
 # $FreeBSD$
+ 
+ident		MALTA64
 
-ident		MALTA
-
+include		"MALTA_COMMON"
+ 
 machine		mips mips64el	# Malta supports both, so it isn't in std.malta
-
+ 
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-
-options 	YAMON
-
-# Don't build any modules yet.
-makeoptions	MODULES_OVERRIDE=""
-
-options 	TICK_USE_YAMON_FREQ=defined
-#options 	TICK_USE_MALTA_RTC=defined
-
+ 
 makeoptions 	KERNLOADADDR=0xffffffff80100000
-
-include		"../malta/std.malta"
-
-hints		"MALTA.hints"		#Default places to look for devices.
-
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-
-options 	DDB
-options 	KDB
-
-options 	SCHED_4BSD		#4BSD scheduler
-options 	INET			#InterNETworking
-options 	NFSCL			#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCL
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-
-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 	ROOTDEVNAME=\"ufs:ada0\"
-
-
-# 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		loop
-device		ether
-device		le
-device		miibus
-device		md
-device		bpf
-device		uart
-device		random
diff --git a/sys/mips/conf/MALTA_COMMON b/sys/mips/conf/MALTA_COMMON
new file mode 100644
index 0000000..5369e41
--- /dev/null
+++ b/sys/mips/conf/MALTA_COMMON
@@ -0,0 +1,52 @@
+# MALTA_COMMON -- Common kernel config options for MALTA boards
+#
+# $FreeBSD$
+
+machine		mips mipsel	# Malta supports both, so it isn't in std.malta
+
+options 	YAMON
+
+# Don't build any modules yet.
+makeoptions	MODULES_OVERRIDE=""
+
+options 	TICK_USE_YAMON_FREQ=defined
+#options 	TICK_USE_MALTA_RTC=defined
+
+include		"../malta/std.malta"
+
+hints		"MALTA.hints"		#Default places to look for devices.
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+
+options 	DDB
+options 	KDB
+
+options 	SCHED_4BSD		#4BSD scheduler
+options 	INET			#InterNETworking
+options 	NFSCL			#Network Filesystem Client
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
+options 	PSEUDOFS		#Pseudo-filesystem framework
+options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+
+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 	ROOTDEVNAME=\"ufs:ada0\"
+
+
+# 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		loop
+device		ether
+device		le
+device		miibus
+device		bpf
+device		md
+device		uart
+device		random