diff options
author | joel <joel@FreeBSD.org> | 2012-06-29 19:05:29 +0000 |
---|---|---|
committer | joel <joel@FreeBSD.org> | 2012-06-29 19:05:29 +0000 |
commit | 0541fc8c5ba2915920b9433bb4e6e741db5fbefa (patch) | |
tree | 4950759f8e4f0024ca19d27fc58fbfd4bb666b59 /sys/powerpc | |
parent | 22a42fcc7023e133ee0f15349a9605fd94418625 (diff) | |
download | FreeBSD-src-0541fc8c5ba2915920b9433bb4e6e741db5fbefa.zip FreeBSD-src-0541fc8c5ba2915920b9433bb4e6e741db5fbefa.tar.gz |
Reduce diffs between GENERIC and GENERIC64. Also fix a few whitespace nits
while I'm here. No functional change.
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/powerpc/conf/GENERIC64 | 17 |
2 files changed, 13 insertions, 10 deletions
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 4cce5ff..4414505 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -21,14 +21,14 @@ cpu AIM ident GENERIC -machine powerpc powerpc +machine powerpc powerpc makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # Platform support options POWERMAC #NewWorld Apple PowerMacs options PSIM #GDB PSIM ppc simulator -options MAMBO #IBM Mambo Full System Simulator +options MAMBO #IBM Mambo Full System Simulator options SCHED_ULE #ULE scheduler options PREEMPTION #Enable kernel thread preemption @@ -82,7 +82,7 @@ options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -# To make an SMP kernel, the next line is needed +# Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel # CPU frequency control diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index bc8c613..112da64 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -21,14 +21,14 @@ cpu AIM ident GENERIC -machine powerpc powerpc64 +machine powerpc powerpc64 makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # Platform support options POWERMAC #NewWorld Apple PowerMacs -options PS3 #Sony Playstation 3 -options MAMBO #IBM Mambo Full System Simulator +options PS3 #Sony Playstation 3 +options MAMBO #IBM Mambo Full System Simulator options SCHED_ULE #ULE scheduler options PREEMPTION #Enable kernel thread preemption @@ -67,8 +67,11 @@ options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework options INCLUDE_CONFIG_FILE # Include this file in kernel -# Debugging for use in -current -options KDB #Enable the kernel debugger +# Debugging support. Always need this: +options KDB # Enable kernel debugger support. +# For minimum debugger support (stable branch) use: +#options KDB_TRACE # Print a stack trace for a panic. +# For full debugger support use this instead: options DDB #Support DDB #options DEADLKRES #Enable the deadlock resolver options INVARIANTS #Enable calls of extra sanity checking @@ -171,8 +174,8 @@ device cue # CATC USB Ethernet device kue # Kawasaki LSI USB Ethernet # Wireless NIC cards -options IEEE80211_SUPPORT_MESH -options AH_SUPPORT_AR5416 +options IEEE80211_SUPPORT_MESH +options AH_SUPPORT_AR5416 # FireWire support device firewire # FireWire bus code |