Add commented out KDTRACE_HOOKS line.diff -r1.27 -r1.28 src/sys/arch/evbarm/conf/BEAGLEBONE
(wiz)
--- src/sys/arch/evbarm/conf/Attic/BEAGLEBONE 2014/08/23 20:26:57 1.27
+++ src/sys/arch/evbarm/conf/Attic/BEAGLEBONE 2014/09/18 15:00:08 1.28
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | # | 1 | # | |
2 | # $NetBSD: BEAGLEBONE,v 1.27 2014/08/23 20:26:57 dholland Exp $ | 2 | # $NetBSD: BEAGLEBONE,v 1.28 2014/09/18 15:00:08 wiz Exp $ | |
3 | # | 3 | # | |
4 | # BEAGLEBONE -- TI AM335x board Kernel | 4 | # BEAGLEBONE -- TI AM335x board Kernel | |
5 | # | 5 | # | |
6 | 6 | |||
7 | include "arch/evbarm/conf/std.beagle" | 7 | include "arch/evbarm/conf/std.beagle" | |
8 | 8 | |||
9 | # estimated number of users | 9 | # estimated number of users | |
10 | 10 | |||
11 | maxusers 32 | 11 | maxusers 32 | |
12 | 12 | |||
13 | # Standard system options | 13 | # Standard system options | |
14 | 14 | |||
15 | options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT | 15 | options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT | |
@@ -120,26 +120,27 @@ options SYSVSHM # System V-like memory | @@ -120,26 +120,27 @@ options SYSVSHM # System V-like memory | |||
120 | options KTRACE # system call tracing, a la ktrace(1) | 120 | options KTRACE # system call tracing, a la ktrace(1) | |
121 | #options KMEMSTATS # kernel memory statistics | 121 | #options KMEMSTATS # kernel memory statistics | |
122 | #options SCSIVERBOSE # Verbose SCSI errors | 122 | #options SCSIVERBOSE # Verbose SCSI errors | |
123 | #options MIIVERBOSE # Verbose MII autoconfuration messages | 123 | #options MIIVERBOSE # Verbose MII autoconfuration messages | |
124 | #options DDB_KEYCODE=0x40 | 124 | #options DDB_KEYCODE=0x40 | |
125 | #options USERCONF # userconf(4) support | 125 | #options USERCONF # userconf(4) support | |
126 | #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) | 126 | #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) | |
127 | 127 | |||
128 | # Development and Debugging options | 128 | # Development and Debugging options | |
129 | 129 | |||
130 | #options PERFCTRS # performance counters | 130 | #options PERFCTRS # performance counters | |
131 | options DIAGNOSTIC # internal consistency checks | 131 | options DIAGNOSTIC # internal consistency checks | |
132 | options DEBUG | 132 | options DEBUG | |
133 | #options KDTRACE_HOOKS # kernel DTrace hooks | |||
133 | #options PMAP_DEBUG # Enable pmap_debug_level code | 134 | #options PMAP_DEBUG # Enable pmap_debug_level code | |
134 | #options IPKDB # remote kernel debugging | 135 | #options IPKDB # remote kernel debugging | |
135 | #options VERBOSE_INIT_ARM # verbose bootstraping messages | 136 | #options VERBOSE_INIT_ARM # verbose bootstraping messages | |
136 | options DDB # in-kernel debugger | 137 | options DDB # in-kernel debugger | |
137 | options DDB_ONPANIC=1 | 138 | options DDB_ONPANIC=1 | |
138 | options DDB_HISTORY_SIZE=100 # Enable history editing in DDB | 139 | options DDB_HISTORY_SIZE=100 # Enable history editing in DDB | |
139 | #options KGDB | 140 | #options KGDB | |
140 | makeoptions DEBUG="-g" # compile full symbol table | 141 | makeoptions DEBUG="-g" # compile full symbol table | |
141 | makeoptions COPY_SYMTAB=1 | 142 | makeoptions COPY_SYMTAB=1 | |
142 | 143 | |||
143 | ## USB Debugging options | 144 | ## USB Debugging options | |
144 | options USB_DEBUG | 145 | options USB_DEBUG | |
145 | options EHCI_DEBUG | 146 | options EHCI_DEBUG |
--- src/sys/arch/evbarm/conf/SHEEVAPLUG 2014/08/23 20:26:57 1.43
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG 2014/09/18 15:00:08 1.44
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: SHEEVAPLUG,v 1.43 2014/08/23 20:26:57 dholland Exp $ | 1 | # $NetBSD: SHEEVAPLUG,v 1.44 2014/09/18 15:00:08 wiz Exp $ | |
2 | # | 2 | # | |
3 | # This configuration supports for generically Marvell SheevaPlug | 3 | # This configuration supports for generically Marvell SheevaPlug | |
4 | # | 4 | # | |
5 | 5 | |||
6 | include "arch/evbarm/conf/std.marvell" | 6 | include "arch/evbarm/conf/std.marvell" | |
7 | 7 | |||
8 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 8 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
9 | 9 | |||
10 | # estimated number of users | 10 | # estimated number of users | |
11 | 11 | |||
12 | maxusers 32 | 12 | maxusers 32 | |
13 | 13 | |||
14 | # Board Type | 14 | # Board Type | |
@@ -147,26 +147,27 @@ options IRQSTATS # manage IRQ statistic | @@ -147,26 +147,27 @@ options IRQSTATS # manage IRQ statistic | |||
147 | options MIIVERBOSE # Verbose MII autoconfuration messages | 147 | options MIIVERBOSE # Verbose MII autoconfuration messages | |
148 | #options PCIVERBOSE # Verbose PCI descriptions | 148 | #options PCIVERBOSE # Verbose PCI descriptions | |
149 | options USBVERBOSE # verbose USB device autoconfig messages | 149 | options USBVERBOSE # verbose USB device autoconfig messages | |
150 | #options DDB_KEYCODE=0x40 | 150 | #options DDB_KEYCODE=0x40 | |
151 | #options USERCONF # userconf(4) support | 151 | #options USERCONF # userconf(4) support | |
152 | #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) | 152 | #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) | |
153 | #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel | 153 | #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel | |
154 | 154 | |||
155 | # Development and Debugging options | 155 | # Development and Debugging options | |
156 | 156 | |||
157 | #options PERFCTRS # performance counters | 157 | #options PERFCTRS # performance counters | |
158 | options DIAGNOSTIC # internal consistency checks | 158 | options DIAGNOSTIC # internal consistency checks | |
159 | options DEBUG | 159 | options DEBUG | |
160 | #options KDTRACE_HOOKS # kernel DTrace hooks | |||
160 | #options LOCKDEBUG | 161 | #options LOCKDEBUG | |
161 | #options PMAP_DEBUG # Enable pmap_debug_level code | 162 | #options PMAP_DEBUG # Enable pmap_debug_level code | |
162 | #options VERBOSE_INIT_ARM # verbose bootstraping messages | 163 | #options VERBOSE_INIT_ARM # verbose bootstraping messages | |
163 | options DDB # in-kernel debugger | 164 | options DDB # in-kernel debugger | |
164 | #options DDB_HISTORY_SIZE=100 # Enable history editing in DDB | 165 | #options DDB_HISTORY_SIZE=100 # Enable history editing in DDB | |
165 | #options KGDB | 166 | #options KGDB | |
166 | #options DEBUG_KGDB | 167 | #options DEBUG_KGDB | |
167 | makeoptions DEBUG="-g" # compile full symbol table | 168 | makeoptions DEBUG="-g" # compile full symbol table | |
168 | #makeoptions COPTS="-O1" | 169 | #makeoptions COPTS="-O1" | |
169 | makeoptions COPY_SYMTAB=1 | 170 | makeoptions COPY_SYMTAB=1 | |
170 | #options AUDIO_DEBUG=2 | 171 | #options AUDIO_DEBUG=2 | |
171 | 172 | |||
172 | config netbsd root on ? type ? | 173 | config netbsd root on ? type ? |