From 43fd679efbdbf300dee851fb77eb4240ce51e014 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Thu, 10 May 2018 09:37:50 +0000 Subject: [PATCH] arm64: Add ALT_BREAK_TO_DEBUGGER to GENERIC It is useful to enter kdb with an escape sequence. While here move the USB_DEBUG with the others debug options and define nooptions USB_DEBUG for GENERIC-NODEBUG --- sys/arm64/conf/GENERIC | 3 ++- sys/arm64/conf/GENERIC-NODEBUG | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index 42eb99887fb..c492d9e4389 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -90,6 +90,8 @@ options INVARIANT_SUPPORT # Extra sanity checks of internal structures, require 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 +options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence +options USB_DEBUG # enable debug msgs # SoC support options SOC_ALLWINNER_A64 @@ -162,7 +164,6 @@ device uart_snps device pl011 # USB support -options USB_DEBUG # enable debug msgs device aw_ehci # Allwinner EHCI USB interface (USB 2.0) device aw_usbphy # Allwinner USB PHY device dwcotg # DWC OTG controller diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG index 6758caef62b..1d7d22d322c 100644 --- a/sys/arm64/conf/GENERIC-NODEBUG +++ b/sys/arm64/conf/GENERIC-NODEBUG @@ -37,4 +37,4 @@ nooptions WITNESS_SKIPSPIN nooptions BUF_TRACKING nooptions DEADLKRES nooptions FULL_BUF_TRACKING - +nooptions USB_DEBUG