svn commit: r227663 - in head/sys/mips: conf nlm
Jayachandran C.
jchandra at FreeBSD.org
Fri Nov 18 11:19:00 UTC 2011
Author: jchandra
Date: Fri Nov 18 11:18:59 2011
New Revision: 227663
URL: http://svn.freebsd.org/changeset/base/227663
Log:
Rearrange XLP configuration files.
Create std.XLP for configuration options, which is included by the
conf files. The files XLP, XLPN32 and XLP64 will have mostly ABI related
options.
Also move uart and pci to mips/nlm/std.xlp since all XLP configurations
needs these devices.
Obtained from: prabhath at netlogicmicro com (intial version)
Added:
head/sys/mips/conf/std.XLP (contents, props changed)
Modified:
head/sys/mips/conf/XLP
head/sys/mips/conf/XLP64
head/sys/mips/conf/XLPN32
head/sys/mips/nlm/std.xlp
Modified: head/sys/mips/conf/XLP
==============================================================================
--- head/sys/mips/conf/XLP Fri Nov 18 11:10:14 2011 (r227662)
+++ head/sys/mips/conf/XLP Fri Nov 18 11:18:59 2011 (r227663)
@@ -23,78 +23,7 @@ ident XLP
options ISA_MIPS32
makeoptions KERNLOADADDR=0x80100000
-include "../nlm/std.xlp"
-makeoptions MODULES_OVERRIDE=""
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-#profile 2
+include "std.XLP"
+
makeoptions TRAMPLOADADDR=0xffffffff85000000
makeoptions TRAMP_ARCH_FLAGS="-mabi=64 -march=mips64"
-
-options SCHED_ULE # ULE scheduler
-#options VERBOSE_SYSINIT
-#options SCHED_4BSD # 4BSD scheduler
-options SMP
-options PREEMPTION # Enable kernel thread preemption
-#options FULL_PREEMPTION # Enable kernel thread preemption
-#options MAXCPU=128 # XLP can probe 128 CPUs
-options INET # InterNETworking
-options INET6 # IPv6 communications protocols
-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 NFSCL
-options NFS_ROOT
-options MSDOSFS #MSDOS Filesystem
-#
-#options BOOTP
-#options BOOTP_NFSROOT
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=nlge0
-#options BOOTP_COMPAT
-#options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
-#
-options MD_ROOT # MD is a potential root device
-options MD_ROOT_SIZE=27000
-options ROOTDEVNAME=\"ufs:md0\"
-options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options HZ=1000
-options NO_SWAPPING
-
-#Debugging options
-options KTRACE # ktrace(1) support
-options DDB
-options KDB
-options GDB
-options BREAK_TO_DEBUGGER
-options ALT_BREAK_TO_DEBUGGER
-#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
-#options KTR # ktr(4) and ktrdump(8) support
-#options KTR_COMPILE=(KTR_LOCK|KTR_PROC|KTR_INTR|KTR_CALLOUT|KTR_UMA|KTR_SYSC)
-#options KTR_ENTRIES=131072
-#options LOCK_DEBUG
-#options LOCK_PROFILING
-
-
-# Pseudo
-device loop
-device random
-device md
-device pty
-device bpf
-
-# UART
-device uart
-device pci
-
-# Network
-device ether
-#
-# FDT support
-#options FDT
-#options FDT_DTB_STATIC
-#makeoptions FDT_DTS_FILE=xlp-basic.dts
Modified: head/sys/mips/conf/XLP64
==============================================================================
--- head/sys/mips/conf/XLP64 Fri Nov 18 11:10:14 2011 (r227662)
+++ head/sys/mips/conf/XLP64 Fri Nov 18 11:18:59 2011 (r227663)
@@ -24,79 +24,7 @@ options ISA_MIPS64
makeoptions ARCH_FLAGS="-march=mips64r2 -mabi=64"
makeoptions KERNLOADADDR=0xffffffff80100000
-include "../nlm/std.xlp"
+include "std.XLP"
-makeoptions MODULES_OVERRIDE=""
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-#profile 2
makeoptions TRAMPLOADADDR=0xffffffff85000000
makeoptions TRAMP_ARCH_FLAGS="-mabi=64 -march=mips64"
-
-options SCHED_ULE # ULE scheduler
-#options VERBOSE_SYSINIT
-#options SCHED_4BSD # 4BSD scheduler
-options SMP
-options PREEMPTION # Enable kernel thread preemption
-#options FULL_PREEMPTION # Enable kernel thread preemption
-#options MAXCPU=128 # XLP can probe 128 CPUs
-options INET # InterNETworking
-options INET6 # IPv6 communications protocols
-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 NFSCL
-options NFS_ROOT
-options MSDOSFS #MSDOS Filesystem
-#
-#options BOOTP
-#options BOOTP_NFSROOT
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=nlge0
-#options BOOTP_COMPAT
-#options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
-#
-options MD_ROOT # MD is a potential root device
-options MD_ROOT_SIZE=27000
-options ROOTDEVNAME=\"ufs:md0\"
-options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options HZ=1000
-options NO_SWAPPING
-
-#Debugging options
-options KTRACE # ktrace(1) support
-options DDB
-options KDB
-options GDB
-options BREAK_TO_DEBUGGER
-options ALT_BREAK_TO_DEBUGGER
-#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
-#options KTR # ktr(4) and ktrdump(8) support
-#options KTR_COMPILE=(KTR_LOCK|KTR_PROC|KTR_INTR|KTR_CALLOUT|KTR_UMA|KTR_SYSC)
-#options KTR_ENTRIES=131072
-#options LOCK_DEBUG
-#options LOCK_PROFILING
-
-
-# Pseudo
-device loop
-device random
-device md
-device pty
-device bpf
-
-# UART
-device uart
-device pci
-
-# Network
-device ether
-
-# FDT support
-#options FDT
-#options FDT_DTB_STATIC
-#makeoptions FDT_DTS_FILE=xlp-basic.dts
Modified: head/sys/mips/conf/XLPN32
==============================================================================
--- head/sys/mips/conf/XLPN32 Fri Nov 18 11:10:14 2011 (r227662)
+++ head/sys/mips/conf/XLPN32 Fri Nov 18 11:18:59 2011 (r227663)
@@ -24,73 +24,7 @@ options ISA_MIPS64
makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32"
makeoptions KERNLOADADDR=0x80100000
-include "../nlm/std.xlp"
-makeoptions MODULES_OVERRIDE=""
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-#profile 2
+include "std.XLP"
+
makeoptions TRAMPLOADADDR=0xffffffff85000000
makeoptions TRAMP_ARCH_FLAGS="-mabi=64 -march=mips64"
-
-options SCHED_ULE # ULE scheduler
-#options VERBOSE_SYSINIT
-#options SCHED_4BSD # 4BSD scheduler
-options SMP
-options PREEMPTION # Enable kernel thread preemption
-#options FULL_PREEMPTION # Enable kernel thread preemption
-#options MAXCPU=128 # XLP can probe 128 CPUs
-options INET # InterNETworking
-options INET6 # IPv6 communications protocols
-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 NFSCL
-options NFS_ROOT
-options MSDOSFS #MSDOS Filesystem
-#
-#options BOOTP
-#options BOOTP_NFSROOT
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=nlge0
-#options BOOTP_COMPAT
-#options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
-#
-options MD_ROOT # MD is a potential root device
-options MD_ROOT_SIZE=27000
-options ROOTDEVNAME=\"ufs:md0\"
-options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options HZ=1000
-options NO_SWAPPING
-
-#Debugging options
-options KTRACE # ktrace(1) support
-#options DDB
-#options KDB
-#options GDB
-#options BREAK_TO_DEBUGGER
-#options ALT_BREAK_TO_DEBUGGER
-#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
-#options KTR # ktr(4) and ktrdump(8) support
-#options KTR_COMPILE=(KTR_LOCK|KTR_PROC|KTR_INTR|KTR_CALLOUT|KTR_UMA|KTR_SYSC)
-#options KTR_ENTRIES=131072
-#options LOCK_DEBUG
-#options LOCK_PROFILING
-
-
-# Pseudo
-device loop
-device random
-device md
-device pty
-device bpf
-
-# UART
-device uart
-device pci
-
-# Network
-device ether
Added: head/sys/mips/conf/std.XLP
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/mips/conf/std.XLP Fri Nov 18 11:18:59 2011 (r227663)
@@ -0,0 +1,81 @@
+# $FreeBSD$
+
+include "../nlm/std.xlp"
+makeoptions MODULES_OVERRIDE=""
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+#profile 2
+
+options SCHED_ULE # ULE scheduler
+#options VERBOSE_SYSINIT
+#options SCHED_4BSD # 4BSD scheduler
+options SMP
+options PREEMPTION # Enable kernel thread preemption
+#options FULL_PREEMPTION # Enable kernel thread preemption
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+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 NFSCL
+options NFS_ROOT
+options MSDOSFS #MSDOS Filesystem
+#
+#options BOOTP
+#options BOOTP_NFSROOT
+#options BOOTP_NFSV3
+#options BOOTP_WIRED_TO=nlge0
+#options BOOTP_COMPAT
+#options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
+
+options MD_ROOT # MD is a potential root device
+options MD_ROOT_SIZE=132000
+options ROOTDEVNAME=\"ufs:md0\"
+options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options HZ=1000
+options NO_SWAPPING
+
+# Debugging options
+options KTRACE # ktrace(1) support
+options DDB
+options KDB
+options GDB
+options BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
+#options DEADLKRES # Enable the deadlock resolver
+#options INVARIANTS
+#options INVARIANT_SUPPORT
+#options WITNESS # Detect deadlocks and cycles
+#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
+#options KTR # ktr(4) and ktrdump(8) support
+#options KTR_COMPILE=(KTR_LOCK|KTR_PROC|KTR_INTR|KTR_CALLOUT|KTR_UMA|KTR_SYSC)
+#options KTR_ENTRIES=131072
+#options LOCK_DEBUG
+#options LOCK_PROFILING
+
+options GEOM_UZIP
+
+# Pseudo
+device loop
+device random
+device md
+device pty
+device bpf
+
+# Network
+device miibus
+device ether
+#device re
+device msk
+device em
+
+# Disks
+device siis
+device da
+device scbus
+#device ata
+#device atadisk
+
+options FDT
+options FDT_DTB_STATIC
+makeoptions FDT_DTS_FILE=xlp-basic.dts
Modified: head/sys/mips/nlm/std.xlp
==============================================================================
--- head/sys/mips/nlm/std.xlp Fri Nov 18 11:10:14 2011 (r227662)
+++ head/sys/mips/nlm/std.xlp Fri Nov 18 11:18:59 2011 (r227663)
@@ -2,3 +2,6 @@
files "../nlm/files.xlp"
cpu CPU_NLM
+# Devices needed always
+device uart
+device pci
More information about the svn-src-all
mailing list