From 8156525e0d6afb584028d91396174f6ea911513b Mon Sep 17 00:00:00 2001
From: neel <neel@FreeBSD.org>
Date: Wed, 15 Sep 2010 05:29:13 +0000
Subject: [PATCH] Factor out the common parts of the swarm board in
 SWARM_COMMON and start including that in SWARM and SWARM_SMP kernel configs.

---
 sys/mips/conf/SWARM        | 66 +++-----------------------------------
 sys/mips/conf/SWARM_COMMON | 60 ++++++++++++++++++++++++++++++++++
 sys/mips/conf/SWARM_SMP    | 10 +++++-
 3 files changed, 73 insertions(+), 63 deletions(-)
 create mode 100644 sys/mips/conf/SWARM_COMMON

diff --git a/sys/mips/conf/SWARM b/sys/mips/conf/SWARM
index 041c94da9837..d4950cb17763 100644
--- a/sys/mips/conf/SWARM
+++ b/sys/mips/conf/SWARM
@@ -2,69 +2,11 @@
 # $FreeBSD$
 #
 
+include		SWARM_COMMON
+
 ident		SWARM
-options		CPU_SB1
 
-files		"../sibyte/files.sibyte"
-hints		"SWARM.hints"
-
-options		CFE
-options		CFE_CONSOLE
-options		CFE_ENV
-options		ALT_BREAK_TO_DEBUGGER
+options		ISA_MIPS32
 
+makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
 makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe
-
-#cpu		CPU_MIPS64
-#options 	ISA_MIPS64
-#makeoptions	ARCH_FLAGS="-march=mips64 -mgp64 -mabi=o64"
-cpu		CPU_MIPS32
-options 	ISA_MIPS32
-makeoptions	ARCH_FLAGS="-march=mips32"
-
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-makeoptions	MODULES_OVERRIDE=""
-
-options		DDB
-options		KDB
-
-options		SCHED_4BSD		#4BSD scheduler
-options		INET			#InterNETworking
-options		NFSCLIENT		#Network Filesystem Client
-options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options		PSEUDOFS		#Pseudo-filesystem framework
-options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-
-# Debugging for use in -current
-#options 	DEADLKRES
-options		INVARIANTS
-options		INVARIANT_SUPPORT
-options		WITNESS
-
-options 	FFS			#Fast filesystem
-
-options		KTRACE
-
-device		pci
-device		miibus
-device		bge
-device		loop
-device		ether
-device		md
-device		random
-
-options		USB_DEBUG
-device usb
-device ohci
-device uhci
-device ehci
-
-device umass
-
-device scbus
-device da
-
-device		ata
-device		atadisk
-device		atapicd
-options		ATA_STATIC_ID
diff --git a/sys/mips/conf/SWARM_COMMON b/sys/mips/conf/SWARM_COMMON
new file mode 100644
index 000000000000..1d22e3cea182
--- /dev/null
+++ b/sys/mips/conf/SWARM_COMMON
@@ -0,0 +1,60 @@
+#
+# $FreeBSD$
+#
+
+files		"../sibyte/files.sibyte"
+hints		"SWARM.hints"
+
+options		CFE
+options		CFE_CONSOLE
+options		CFE_ENV
+options		ALT_BREAK_TO_DEBUGGER
+
+cpu		CPU_SB1
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	MODULES_OVERRIDE=""
+
+options		DDB
+options		KDB
+
+options		SCHED_4BSD		#4BSD scheduler
+options		INET			#InterNETworking
+options		NFSCLIENT		#Network Filesystem Client
+options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options		PSEUDOFS		#Pseudo-filesystem framework
+options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+
+# Debugging for use in -current
+#options 	DEADLKRES
+options		INVARIANTS
+options		INVARIANT_SUPPORT
+options		WITNESS
+
+options 	FFS			#Fast filesystem
+
+options		KTRACE
+
+device		pci
+device		miibus
+device		bge
+device		loop
+device		ether
+device		md
+device		random
+
+options		USB_DEBUG
+device usb
+device ohci
+device uhci
+device ehci
+
+device umass
+
+device scbus
+device da
+
+device		ata
+device		atadisk
+device		atapicd
+options		ATA_STATIC_ID
diff --git a/sys/mips/conf/SWARM_SMP b/sys/mips/conf/SWARM_SMP
index ec76ce4ac173..534d0856d756 100644
--- a/sys/mips/conf/SWARM_SMP
+++ b/sys/mips/conf/SWARM_SMP
@@ -1,7 +1,15 @@
 #
 # $FreeBSD$
 #
+
+include		SWARM_COMMON
+
+ident		SWARM_SMP
+
 options		SMP
 options		PRINTF_BUFR_SIZE=128
 
-include		SWARM
+options		ISA_MIPS32
+
+makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
+makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe