From 55deefdb308d707dc167559f5d70d4141bda2cd9 Mon Sep 17 00:00:00 2001
From: liuhaitao <liuhaitao@xiaomi.com>
Date: Wed, 4 Nov 2020 20:55:21 +0800
Subject: [PATCH] Add debug.h selection choice to support include chip debug.h

Select debug.h which may be under include/arch or include/arch/chip.

Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
Change-Id: I5f465c41ba27d040e5e24b2eef2918cfbc18a0bd
---
 Kconfig         | 19 +++++++++++++++++--
 include/debug.h |  3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Kconfig b/Kconfig
index 233fee3d3d..0ca954748d 100644
--- a/Kconfig
+++ b/Kconfig
@@ -495,11 +495,26 @@ config ARCH_SETJMP_H
 		ARCH_SETJMP_H=y and providing. If ARCH_SETJMP_H, is not defined, then
 		the setjmp.h header file will stay out-of-the-way in include/nuttx/.
 
+choice
+	prompt "debug.h selection"
+	default ARCH_NONE_DEBUG_H
+
+config ARCH_NONE_DEBUG_H
+	bool "None"
+	---help---
+		No debug.h under include/arch/ and include/arch/chip.
+
 config ARCH_DEBUG_H
 	bool "debug.h"
-	default n
 	---help---
-		The debug.h contains architecture dependent debugging primitives
+		The debug.h under include/arch contains architecture dependent debugging primitives
+
+config ARCH_CHIP_DEBUG_H
+	bool "chip debug.h"
+	---help---
+		The debug.h under include/arch/chip contains architecture dependent debugging primitives
+
+endchoice # debug.h selection
 
 endmenu # Customize Header Files
 
diff --git a/include/debug.h b/include/debug.h
index 324c130a3d..dcebe4c099 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -46,6 +46,9 @@
 #ifdef CONFIG_ARCH_DEBUG_H
 # include <arch/debug.h>
 #endif
+#ifdef CONFIG_ARCH_CHIP_DEBUG_H
+# include <arch/chip/debug.h>
+#endif
 
 #include <syslog.h>