svn commit: r302915 - in stable/11/sys/arm: conf lpc samsung/exynos

Ian Lepore ian at FreeBSD.org
Fri Jul 15 21:30:23 UTC 2016 

Author: ian
Date: Fri Jul 15 21:30:19 2016
New Revision: 302915
URL: https://svnweb.freebsd.org/changeset/base/302915

Log:
  MFC r302502, r302505:
  
    Consolidate debugging options from all arm kernel configs to std.arm[v6].
  
    Correct syntax errors that only show up when compiled with INVARIANTS.
  
  Approved by:	re (gjb)

Modified:
  stable/11/sys/arm/conf/A10
  stable/11/sys/arm/conf/ALLWINNER
  stable/11/sys/arm/conf/ALPINE
  stable/11/sys/arm/conf/AML8726
  stable/11/sys/arm/conf/ARMADA38X
  stable/11/sys/arm/conf/ARMADAXP
  stable/11/sys/arm/conf/ATMEL
  stable/11/sys/arm/conf/AVILA
  stable/11/sys/arm/conf/BEAGLEBONE
  stable/11/sys/arm/conf/BWCT
  stable/11/sys/arm/conf/CAMBRIA
  stable/11/sys/arm/conf/CNS11XXNAS
  stable/11/sys/arm/conf/CRB
  stable/11/sys/arm/conf/DB-78XXX
  stable/11/sys/arm/conf/DB-88F5XXX
  stable/11/sys/arm/conf/DB-88F6XXX
  stable/11/sys/arm/conf/DOCKSTAR
  stable/11/sys/arm/conf/DREAMPLUG-1001
  stable/11/sys/arm/conf/EA3250
  stable/11/sys/arm/conf/EB9200
  stable/11/sys/arm/conf/EFIKA_MX
  stable/11/sys/arm/conf/ETHERNUT5
  stable/11/sys/arm/conf/EXYNOS5.common
  stable/11/sys/arm/conf/GUMSTIX
  stable/11/sys/arm/conf/HL200
  stable/11/sys/arm/conf/HL201
  stable/11/sys/arm/conf/IMX53
  stable/11/sys/arm/conf/IMX6
  stable/11/sys/arm/conf/KB920X
  stable/11/sys/arm/conf/NSLU
  stable/11/sys/arm/conf/PANDABOARD
  stable/11/sys/arm/conf/QILA9G20
  stable/11/sys/arm/conf/RK3188
  stable/11/sys/arm/conf/RPI-B
  stable/11/sys/arm/conf/RPI2
  stable/11/sys/arm/conf/SAM9260EK
  stable/11/sys/arm/conf/SAM9G20EK
  stable/11/sys/arm/conf/SAM9X25EK
  stable/11/sys/arm/conf/SHEEVAPLUG
  stable/11/sys/arm/conf/SN9G45
  stable/11/sys/arm/conf/SOCKIT.common
  stable/11/sys/arm/conf/TEGRA124
  stable/11/sys/arm/conf/TS7800
  stable/11/sys/arm/conf/VERSATILEPB
  stable/11/sys/arm/conf/VIRT
  stable/11/sys/arm/conf/VYBRID
  stable/11/sys/arm/conf/ZEDBOARD
  stable/11/sys/arm/conf/std.arm
  stable/11/sys/arm/conf/std.armv6
  stable/11/sys/arm/lpc/if_lpe.c
  stable/11/sys/arm/samsung/exynos/chrome_kb.c

Modified: stable/11/sys/arm/conf/A10
==============================================================================
--- stable/11/sys/arm/conf/A10	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/A10	Fri Jul 15 21:30:19 2016	(r302915)
@@ -32,21 +32,6 @@ options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 options 	MULTIDELAY
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-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			# Enable the kernel debugger
-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 	DIAGNOSTIC
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -94,9 +79,6 @@ device		pass			# Passthrough device (dir
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
-options 	USB_DEBUG
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
 #device		uhci
 device		ohci
 device		ehci

Modified: stable/11/sys/arm/conf/ALLWINNER
==============================================================================
--- stable/11/sys/arm/conf/ALLWINNER	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/ALLWINNER	Fri Jul 15 21:30:19 2016	(r302915)
@@ -39,21 +39,6 @@ options 	PLATFORM
 options 	PLATFORM_SMP
 options 	MULTIDELAY
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-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			# Enable the kernel debugger
-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 	DIAGNOSTIC
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -109,9 +94,6 @@ device		pass			# Passthrough device (dir
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
-options 	USB_DEBUG
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
 #device		uhci
 device		ohci
 device		ehci

Modified: stable/11/sys/arm/conf/ALPINE
==============================================================================
--- stable/11/sys/arm/conf/ALPINE	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/ALPINE	Fri Jul 15 21:30:19 2016	(r302915)
@@ -29,12 +29,6 @@ options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	SMP			# Enable multiple cores
 
-# Debugging
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-options 	KDB
-options 	DDB			#Enable the kernel debugger
-
 # Interrupt controller
 device		gic
 options 	INTRNG

Modified: stable/11/sys/arm/conf/AML8726
==============================================================================
--- stable/11/sys/arm/conf/AML8726	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/AML8726	Fri Jul 15 21:30:19 2016	(r302915)
@@ -28,22 +28,6 @@ options 	SCHED_ULE		# ULE scheduler
 options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	LINUX_BOOT_ABI
 
-# Debugging
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-options 	BOOTVERBOSE=1
-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			# Enable the kernel debugger
-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 	DIAGNOSTIC
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -94,9 +78,6 @@ device		bpf			# Berkeley packet filter
 device		usb			# General USB code (mandatory for USB)
 device		dwcotg			# DWC OTG controller
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
-options 	USB_DEBUG
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
 
 #device		ukbd			# USB keyboard
 #device		ums			# USB mouse

Modified: stable/11/sys/arm/conf/ARMADA38X
==============================================================================
--- stable/11/sys/arm/conf/ARMADA38X	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/ARMADA38X	Fri Jul 15 21:30:19 2016	(r302915)
@@ -11,7 +11,6 @@ ident 	ARMADA38X
 
 options 	SOC_MV_ARMADA38X
 
-makeoptions 	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions 	WERROR="-Werror"
 
 options 	MD_ROOT
@@ -24,22 +23,6 @@ options 	SCHED_ULE		# ULE scheduler
 
 options 	SMP
 
-# Debugging
-#options 	DEBUG
-#options 	VERBOSE_SYSINIT
-options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-#options 	GDB
-#options 	DIAGNOSTIC
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	KDB
-options 	KDB_TRACE
-#options 	WITNESS			# Enable checks to detect deadlocks and cycles
-#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	WITNESS_KDB
-#options 	BOOTVERBOSE
-
 # Pseudo devices
 device		random
 device		pty

Modified: stable/11/sys/arm/conf/ARMADAXP
==============================================================================
--- stable/11/sys/arm/conf/ARMADAXP	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/ARMADAXP	Fri Jul 15 21:30:19 2016	(r302915)
@@ -31,28 +31,6 @@ options 	HZ=1000
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-options 	ALT_BREAK_TO_DEBUGGER
-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			# Enable the kernel debugger
-options 	GDB
-#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 	WITNESS_KDB
-#options 	DIAGNOSTIC
-#options 	KTR
-#options 	KTR_VERBOSE=0
-#options 	KTR_ENTRIES=16384
-#options 	KTR_MASK=(KTR_SPARE2)
-#options 	KTR_COMPILE=KTR_ALL
-
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
@@ -73,7 +51,6 @@ device		loop
 device		md
 
 # USB
-options 	USB_DEBUG		# enable debug msgs
 device		usb
 device		ehci
 device		umass

Modified: stable/11/sys/arm/conf/ATMEL
==============================================================================
--- stable/11/sys/arm/conf/ATMEL	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/ATMEL	Fri Jul 15 21:30:19 2016	(r302915)
@@ -31,8 +31,6 @@ device		at91_board_sam9x25ek
 device		at91_board_sn9g45
 device		at91_board_tsc4370
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
@@ -72,20 +70,6 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent 
 #options 	MAC			# TrustedBSD MAC Framework
 #options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
-# 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			# Enable the kernel debugger
-options 	GDB			# Support remote GDB
-#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 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
-
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
@@ -152,10 +136,8 @@ device		ses			# Enclosure Services (SES 
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
-options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
-options 	USB_DEBUG		# enable debug msgs
 device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da

Modified: stable/11/sys/arm/conf/AVILA
==============================================================================
--- stable/11/sys/arm/conf/AVILA	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/AVILA	Fri Jul 15 21:30:19 2016	(r302915)
@@ -29,23 +29,11 @@ options 	XSCALE_CACHE_READ_WRITE_ALLOCAT
 hints		"AVILA.hints"		# Default places to look for devices.
 makeoptions	MODULES_OVERRIDE=""
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale
 #options 	HZ=1000
 options 	HZ=100
 options 	DEVICE_POLLING
 
-# Debugging for use in -current
-options 	KDB
-#options 	GDB
-options 	DDB			# Enable the kernel 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 	DIAGNOSTIC
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	GEOM_PART_BSD		# BSD partition scheme
@@ -146,7 +134,6 @@ device		ath_ar9160
 device		ath_ar9280
 
 device		usb
-#options 	USB_DEBUG
 device		ohci
 device		ehci
 device		umass

Modified: stable/11/sys/arm/conf/BEAGLEBONE
==============================================================================
--- stable/11/sys/arm/conf/BEAGLEBONE	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/BEAGLEBONE	Fri Jul 15 21:30:19 2016	(r302915)
@@ -34,21 +34,6 @@ options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-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			# Enable the kernel debugger
-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 	DIAGNOSTIC
-
 # NFS server support
 #options 	NFSD
 
@@ -114,9 +99,6 @@ device		pmu
 # USB support
 device		usb
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
-options 	USB_DEBUG
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
 device		musb
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)

Modified: stable/11/sys/arm/conf/BWCT
==============================================================================
--- stable/11/sys/arm/conf/BWCT	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/BWCT	Fri Jul 15 21:30:19 2016	(r302915)
@@ -30,8 +30,6 @@ include 	"../at91/std.bwct"
 hints		"BWCT.hints"
 makeoptions	MODULES_OVERRIDE=""
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 #options 	INET6			# IPv6 communications protocols
@@ -59,16 +57,6 @@ options 	SYSVMSG			# SYSV-style message 
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #POSIX P1003_1B real-time extensions
 
-# Debugging for use in -current
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel 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 	DIAGNOSTIC
-
 options 	BOOTP
 options 	BOOTP_NFSROOT
 
@@ -120,11 +108,8 @@ device		md			# Memory "disks"
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
-options 	BREAK_TO_DEBUGGER
-options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
-#options USB_DEBUG
 #device		ohci
 #device		usb
 #device		umass			# Disks/Mass storage - Requires scbus and da

Modified: stable/11/sys/arm/conf/CAMBRIA
==============================================================================
--- stable/11/sys/arm/conf/CAMBRIA	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/CAMBRIA	Fri Jul 15 21:30:19 2016	(r302915)
@@ -28,24 +28,12 @@ options 	XSCALE_CACHE_READ_WRITE_ALLOCAT
 #To statically compile in device wiring instead of /boot/device.hints
 hints		"CAMBRIA.hints"		# Default places to look for devices.
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale
 makeoptions	MODULES_OVERRIDE=""
 #options 	HZ=1000
 options 	HZ=100
 options 	DEVICE_POLLING
 
-# Debugging for use in -current
-options 	KDB
-#options 	GDB
-options 	DDB			# Enable the kernel 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 	DIAGNOSTIC
-
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION
 options 	INET			# InterNETworking
@@ -141,7 +129,6 @@ device		ath_hal
 # NB: 2 USB 2.0 ports standard
 device		usb
 options 	USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-#options 	USB_DEBUG
 device		ehci
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)

Modified: stable/11/sys/arm/conf/CNS11XXNAS
==============================================================================
--- stable/11/sys/arm/conf/CNS11XXNAS	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/CNS11XXNAS	Fri Jul 15 21:30:19 2016	(r302915)
@@ -30,21 +30,9 @@ include 	"../cavium/cns11xx/std.econa"
 
 makeoptions	MODULES_OVERRIDE=""
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	HZ=100
 options 	DEVICE_POLLING
 
-# Debugging for use in -current
-options 	KDB
-#options 	GDB
-options 	DDB			# Enable the kernel 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 	DIAGNOSTIC
-
 
 options 	SCHED_ULE		# ULE scheduler
 #options 	SCHED_4BSD		# 4BSD scheduler
@@ -102,7 +90,6 @@ device		random			# Entropy device
 
 
 device		usb
-#options 	USB_DEBUG
 device		ohci
 device		ehci
 device		umass

Modified: stable/11/sys/arm/conf/CRB
==============================================================================
--- stable/11/sys/arm/conf/CRB	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/CRB	Fri Jul 15 21:30:19 2016	(r302915)
@@ -27,10 +27,8 @@ options 	COUNTS_PER_SEC=400000000
 include 	"../xscale/i8134x/std.crb"
 makeoptions	MODULES_OVERRIDE=""
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale
 options 	HZ=100
-options 	BREAK_TO_DEBUGGER
 #options 	DEVICE_POLLING
 
 options 	SCHED_4BSD		# 4BSD scheduler
@@ -90,16 +88,6 @@ device		"7seg"
 #options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~215k to driver.
 
-# Debugging for use in -current
-options 	KDB
-options 	DDB			# Enable the kernel 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 	DIAGNOSTIC
-
 options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
 device		md
 device		random			# Entropy device

Modified: stable/11/sys/arm/conf/DB-78XXX
==============================================================================
--- stable/11/sys/arm/conf/DB-78XXX	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/DB-78XXX	Fri Jul 15 21:30:19 2016	(r302915)
@@ -10,7 +10,6 @@ include 	"../mv/discovery/std.db78xxx"
 
 options 	SOC_MV_DISCOVERY
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"
 
 options 	SCHED_4BSD		# 4BSD scheduler
@@ -40,18 +39,6 @@ options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
-# Debugging
-options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-#options 	DEADLKRES		# Enable the deadlock resolver
-#options 	DIAGNOSTIC
-#options 	INVARIANTS		# Enable calls of extra sanity checking
-#options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	KDB
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	WITNESS_KDB
-
 device		pci
 
 # Pseudo devices
@@ -71,7 +58,6 @@ device		e1000phy
 device		bpf
 
 # USB
-options 	USB_DEBUG		# enable debug msgs
 device		usb
 device		ehci
 device		umass

Modified: stable/11/sys/arm/conf/DB-88F5XXX
==============================================================================
--- stable/11/sys/arm/conf/DB-88F5XXX	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/DB-88F5XXX	Fri Jul 15 21:30:19 2016	(r302915)
@@ -10,7 +10,6 @@ include 	"../mv/orion/std.db88f5xxx"
 
 options 	SOC_MV_ORION
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"
 
 options 	SCHED_4BSD		# 4BSD scheduler
@@ -39,18 +38,6 @@ options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
-# Debugging
-options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-#options 	DEADLKRES		# Enable the deadlock resolver
-#options 	DIAGNOSTIC
-#options 	INVARIANTS		# Enable calls of extra sanity checking
-#options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	KDB
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	WITNESS_KDB
-
 device		pci
 
 # Pseudo devices
@@ -78,7 +65,6 @@ device		twsi
 device		ds133x
 
 # USB
-options 	USB_DEBUG		# enable debug msgs
 device		usb
 device		ehci
 device		umass

Modified: stable/11/sys/arm/conf/DB-88F6XXX
==============================================================================
--- stable/11/sys/arm/conf/DB-88F6XXX	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/DB-88F6XXX	Fri Jul 15 21:30:19 2016	(r302915)
@@ -32,19 +32,6 @@ options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
-# Debugging for use in -current
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel 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 	WITNESS_KDB
-#options 	DIAGNOSTIC
-
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
@@ -76,7 +63,6 @@ device		crypto
 device		cryptodev
 
 # USB
-options 	USB_DEBUG		# enable debug msgs
 device		usb
 device		ehci
 device		umass

Modified: stable/11/sys/arm/conf/DOCKSTAR
==============================================================================
--- stable/11/sys/arm/conf/DOCKSTAR	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/DOCKSTAR	Fri Jul 15 21:30:19 2016	(r302915)
@@ -48,18 +48,6 @@ options 	SYSVMSG			# SYSV-style message 
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel debugger
-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 	WITNESS_KDB
-#options 	DIAGNOSTIC
-
 # Enable these options for nfs root configured via BOOTP.
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -101,7 +89,6 @@ device		e1000phy
 
 # USB
 options 	USB_HOST_ALIGN=32	# Align DMA to cacheline
-#options 	USB_DEBUG       	# Compile in USB debug support
 device		usb  			# Basic usb support			
 device		ehci 			# USB host controller
 device		umass			# Mass storage

Modified: stable/11/sys/arm/conf/DREAMPLUG-1001
==============================================================================
--- stable/11/sys/arm/conf/DREAMPLUG-1001	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/DREAMPLUG-1001	Fri Jul 15 21:30:19 2016	(r302915)
@@ -51,18 +51,6 @@ options 	SYSVMSG			# SYSV-style message 
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel debugger
-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 	WITNESS_KDB
-#options 	DIAGNOSTIC
-
 # Enable these options for nfs root configured via BOOTP.
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -105,7 +93,6 @@ device		e1000phy
 
 # USB
 options 	USB_HOST_ALIGN=32	# Align DMA to cacheline
-#options 	USB_DEBUG       	# Compile in USB debug support
 device		usb  			# Basic usb support			
 device		ehci 			# USB host controller
 device		umass			# Mass storage

Modified: stable/11/sys/arm/conf/EA3250
==============================================================================
--- stable/11/sys/arm/conf/EA3250	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/EA3250	Fri Jul 15 21:30:19 2016	(r302915)
@@ -11,7 +11,6 @@ hints		"EA3250.hints"
 
 makeoptions	MODULES_OVERRIDE=""
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"
 
 options 	SCHED_4BSD		# 4BSD scheduler
@@ -41,18 +40,6 @@ options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
-# Debugging
-options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-#options 	DEADLKRES		# Enable the deadlock resolver
-#options 	DIAGNOSTIC
-#options 	INVARIANTS		# Enable calls of extra sanity checking
-#options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	KDB
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	WITNESS_KDB
-
 # Pseudo devices
 device		loop
 device		md
@@ -69,7 +56,6 @@ device		bpf
 device		lpe
 
 # USB
-options 	USB_DEBUG
 device		usb
 device		ohci
 device		umass

Modified: stable/11/sys/arm/conf/EB9200
==============================================================================
--- stable/11/sys/arm/conf/EB9200	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/EB9200	Fri Jul 15 21:30:19 2016	(r302915)
@@ -23,8 +23,6 @@ include 	"../at91/std.eb9200"
 hints		"EB9200.hints"
 makeoptions	MODULES_OVERRIDE=""
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 #options 	INET6			# IPv6 communications protocols
@@ -53,15 +51,6 @@ options 	SYSVMSG			# SYSV-style message 
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Debugging for use in -current
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel 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
-
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
@@ -115,7 +104,6 @@ device		pass			# Passthrough device (dir
 device		uart			# Multi-uart driver
 
 # USB support
-options 	USB_DEBUG		# enable debug msgs
 device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da

Modified: stable/11/sys/arm/conf/EFIKA_MX
==============================================================================
--- stable/11/sys/arm/conf/EFIKA_MX	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/EFIKA_MX	Fri Jul 15 21:30:19 2016	(r302915)
@@ -33,22 +33,6 @@ options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-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			# Enable the kernel debugger
-#options 	GDB			# Support remote GDB
-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
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -83,7 +67,6 @@ device		ether			# Ethernet support
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
-options 	ALT_BREAK_TO_DEBUGGER
 
 device		ata
 device		atapci			# Only for helper functions
@@ -104,7 +87,6 @@ device		pass			# Passthrough device (dir
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
-#options 	USB_DEBUG		# enable debug msgs
 device		ehci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da

Modified: stable/11/sys/arm/conf/ETHERNUT5
==============================================================================
--- stable/11/sys/arm/conf/ETHERNUT5	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/ETHERNUT5	Fri Jul 15 21:30:19 2016	(r302915)
@@ -27,8 +27,6 @@ include 	"../at91/std.ethernut5"
 # To statically compile in device wiring instead of /boot/device.hints
 hints		"ETHERNUT5.hints"
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
@@ -68,20 +66,6 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent 
 #options 	MAC			# TrustedBSD MAC Framework
 #options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
-# 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			# Enable the kernel debugger
-#options 	GDB			# Support remote GDB
-#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 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
-
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
@@ -148,10 +132,8 @@ device		ether			# Ethernet support
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
-options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
-#options 	USB_DEBUG		# enable debug msgs
 device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 #device		umass			# Disks/Mass storage - Requires scbus and da

Modified: stable/11/sys/arm/conf/EXYNOS5.common
==============================================================================
--- stable/11/sys/arm/conf/EXYNOS5.common	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/EXYNOS5.common	Fri Jul 15 21:30:19 2016	(r302915)
@@ -56,21 +56,6 @@ options 	FREEBSD_BOOT_LOADER	# Process m
 options 	VFP			# Enable floating point hardware support
 options 	SMP			# Enable multiple cores
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	ALT_BREAK_TO_DEBUGGER
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-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			# Enable the kernel debugger
-#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 	DIAGNOSTIC
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -103,9 +88,6 @@ device		gpio
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
-options 	USB_DEBUG
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
 #device		musb
 device		ehci
 #device		ohci

Modified: stable/11/sys/arm/conf/GUMSTIX
==============================================================================
--- stable/11/sys/arm/conf/GUMSTIX	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/GUMSTIX	Fri Jul 15 21:30:19 2016	(r302915)
@@ -33,7 +33,6 @@ options 	KERNVIRTADDR=0xc0200000	# Used 
 include 	"../xscale/pxa/std.pxa"
 makeoptions	MODULES_OVERRIDE=""
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	HZ=100
 #options 	DEVICE_POLLING
 
@@ -78,15 +77,5 @@ device		smcphy
 device		uart
 device		uart_ns8250
 
-# Debugging for use in -current
-options 	KDB
-options 	DDB			# Enable the kernel 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 	DIAGNOSTIC
-
 device		md
 device		random			# Entropy device

Modified: stable/11/sys/arm/conf/HL200
==============================================================================
--- stable/11/sys/arm/conf/HL200	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/HL200	Fri Jul 15 21:30:19 2016	(r302915)
@@ -28,8 +28,6 @@ include 	"../at91/std.hl200"
 hints		"KB920X.hints"
 makeoptions	MODULES_OVERRIDE=""
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 #options 	INET6			# IPv6 communications protocols
@@ -57,15 +55,6 @@ options 	SYSVMSG			# SYSV-style message 
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Debugging for use in -current
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel 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 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_COMPAT
@@ -123,7 +112,6 @@ device		pass			# Passthrough device (dir
 device		uart			# Multi-uart driver
 
 # USB support
-options 	USB_DEBUG		# enable debug msgs
 device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 #device		udbp			# USB Double Bulk Pipe devices

Modified: stable/11/sys/arm/conf/HL201
==============================================================================
--- stable/11/sys/arm/conf/HL201	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/HL201	Fri Jul 15 21:30:19 2016	(r302915)
@@ -26,8 +26,6 @@ include 	"../at91/std.hl201"
 
 makeoptions	MODULES_OVERRIDE=""
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 #options 	INET6			# IPv6 communications protocols
@@ -56,15 +54,6 @@ options 	SYSVMSG			# SYSV-style message 
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Debugging for use in -current
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel debugger
-#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 	DIAGNOSTIC
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -114,7 +103,6 @@ device		pass			# Passthrough device (dir
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
-options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
 device		ohci			# OHCI USB interface

Modified: stable/11/sys/arm/conf/IMX53
==============================================================================
--- stable/11/sys/arm/conf/IMX53	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/IMX53	Fri Jul 15 21:30:19 2016	(r302915)
@@ -30,20 +30,6 @@ options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-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			# Enable the kernel debugger
-#options 	GDB			# Support remote GDB
-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
-
 # kernel/memory size reduction
 #options 	MUTEX_NOINLINE
 #options 	NO_FFS_SNAPSHOT
@@ -72,7 +58,6 @@ device		miibus			# Standard mii bus
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
-options 	ALT_BREAK_TO_DEBUGGER
 
 device		ata
 device		atapci			# Only for helper functions
@@ -93,7 +78,6 @@ device		pass			# Passthrough device (dir
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
-options 	USB_DEBUG		# enable debug msgs
 device		ehci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da

Modified: stable/11/sys/arm/conf/IMX6
==============================================================================
--- stable/11/sys/arm/conf/IMX6	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/IMX6	Fri Jul 15 21:30:19 2016	(r302915)
@@ -33,23 +33,6 @@ options 	INCLUDE_CONFIG_FILE	# Include t
 options 	PLATFORM
 options 	SMP			# Enable multiple cores
 
-# Debugging for use in -current
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-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			# Enable the kernel debugger
-#options 	GDB			# Support remote GDB.
-# Other debugging options...
-options 	ALT_BREAK_TO_DEBUGGER	# Use <CR><tilde><ctrl-b> to enter 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 	DIAGNOSTIC
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -97,7 +80,6 @@ device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
-#options 	USB_DEBUG		# enable debug msgs
 device		ehci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da

Modified: stable/11/sys/arm/conf/KB920X
==============================================================================
--- stable/11/sys/arm/conf/KB920X	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/KB920X	Fri Jul 15 21:30:19 2016	(r302915)
@@ -29,8 +29,6 @@ include 	"../at91/std.kb920x"
 hints		"KB920X.hints"
 makeoptions	MODULES_OVERRIDE=""
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 #options 	INET6			# IPv6 communications protocols
@@ -58,15 +56,6 @@ options 	SYSVMSG			# SYSV-style message 
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Debugging for use in -current
-options 	KDB			# Enable kernel debugger support
-options 	DDB			# Enable the kernel 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
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -130,7 +119,6 @@ device		wlan_tkip		# 802.11 TKIP support
 device		wlan_amrr		# AMRR transmit rate control algorithm
 
 # USB support
-options 	USB_DEBUG		# enable debug msgs
 device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 #device		udbp			# USB Double Bulk Pipe devices

Modified: stable/11/sys/arm/conf/NSLU
==============================================================================
--- stable/11/sys/arm/conf/NSLU	Fri Jul 15 20:27:21 2016	(r302914)
+++ stable/11/sys/arm/conf/NSLU	Fri Jul 15 21:30:19 2016	(r302915)
@@ -36,22 +36,10 @@ options 	XSCALE_CACHE_READ_WRITE_ALLOCAT
 hints		"NSLU.hints"		# Default places to look for devices.
 makeoptions	MODULES_OVERRIDE=""
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-all mailing list