Author: neel
Date: Wed Sep 15 05:29:13 2010
New Revision: 212633
URL: http://svn.freebsd.org/changeset/base/212633

Log:
  Factor out the common parts of the swarm board in SWARM_COMMON and start
  including that in SWARM and SWARM_SMP kernel configs.

Added:
  head/sys/mips/conf/SWARM_COMMON   (contents, props changed)
Modified:
  head/sys/mips/conf/SWARM
  head/sys/mips/conf/SWARM_SMP

Modified: head/sys/mips/conf/SWARM
==============================================================================
--- head/sys/mips/conf/SWARM    Wed Sep 15 05:10:50 2010        (r212632)
+++ head/sys/mips/conf/SWARM    Wed Sep 15 05:29:13 2010        (r212633)
@@ -2,69 +2,11 @@
 # $FreeBSD$
 #
 
-ident          SWARM
-options                CPU_SB1
+include                SWARM_COMMON
 
-files          "../sibyte/files.sibyte"
-hints          "SWARM.hints"
+ident          SWARM
 
-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

Added: head/sys/mips/conf/SWARM_COMMON
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/mips/conf/SWARM_COMMON     Wed Sep 15 05:29:13 2010        
(r212633)
@@ -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

Modified: head/sys/mips/conf/SWARM_SMP
==============================================================================
--- head/sys/mips/conf/SWARM_SMP        Wed Sep 15 05:10:50 2010        
(r212632)
+++ head/sys/mips/conf/SWARM_SMP        Wed Sep 15 05:29:13 2010        
(r212633)
@@ -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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to