From d005586e713277c14ef87668de69a5c01f6bfeac Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 10 Nov 2010 00:28:20 +0000 Subject: rename SWARM_COMMON to std.SWARM so universe doesn't try to build it standalone --- sys/mips/conf/SWARM | 2 +- sys/mips/conf/SWARM64 | 2 +- sys/mips/conf/SWARM64_SMP | 2 +- sys/mips/conf/SWARM_COMMON | 60 ---------------------------------------------- sys/mips/conf/SWARM_SMP | 2 +- sys/mips/conf/std.SWARM | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 sys/mips/conf/SWARM_COMMON create mode 100644 sys/mips/conf/std.SWARM (limited to 'sys/mips') diff --git a/sys/mips/conf/SWARM b/sys/mips/conf/SWARM index d4950cb..6db2181 100644 --- a/sys/mips/conf/SWARM +++ b/sys/mips/conf/SWARM @@ -2,7 +2,7 @@ # $FreeBSD$ # -include SWARM_COMMON +include std.SWARM ident SWARM diff --git a/sys/mips/conf/SWARM64 b/sys/mips/conf/SWARM64 index 72931b5..af04269 100644 --- a/sys/mips/conf/SWARM64 +++ b/sys/mips/conf/SWARM64 @@ -2,7 +2,7 @@ # $FreeBSD$ # -include SWARM_COMMON +include std.SWARM ident SWARM64 diff --git a/sys/mips/conf/SWARM64_SMP b/sys/mips/conf/SWARM64_SMP index 863c0f0..7985210 100644 --- a/sys/mips/conf/SWARM64_SMP +++ b/sys/mips/conf/SWARM64_SMP @@ -2,7 +2,7 @@ # $FreeBSD$ # -include SWARM_COMMON +include std.SWARM ident SWARM64_SMP diff --git a/sys/mips/conf/SWARM_COMMON b/sys/mips/conf/SWARM_COMMON deleted file mode 100644 index 1d22e3c..0000000 --- a/sys/mips/conf/SWARM_COMMON +++ /dev/null @@ -1,60 +0,0 @@ -# -# $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 534d085..925f1bb 100644 --- a/sys/mips/conf/SWARM_SMP +++ b/sys/mips/conf/SWARM_SMP @@ -2,7 +2,7 @@ # $FreeBSD$ # -include SWARM_COMMON +include std.SWARM ident SWARM_SMP diff --git a/sys/mips/conf/std.SWARM b/sys/mips/conf/std.SWARM new file mode 100644 index 0000000..1d22e3c --- /dev/null +++ b/sys/mips/conf/std.SWARM @@ -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 -- cgit v1.1