From 240935fd5653a0e9b37ab058f699cb1bf35752c9 Mon Sep 17 00:00:00 2001
From: wangbowen6 <wangbowen6@xiaomi.com>
Date: Tue, 22 Mar 2022 13:10:58 +0800
Subject: [PATCH] SEGGER_RTT: solve compile error when enable segger rtt in
 armv7m.

1. SEGGER_RTT_ASM_ARMv7M include SEGGER_RTT.h, and SEGGER_RTT.h
include SEGGER_RTT_Conf.h, so add __ASSEMBLY__ in
SEGGER_RTT_Conf.h;
2. AFLAG add segger/config because SEGGER_RTT_ASM_ARMv7M.S
include SEGGER_RTT_Conf.h;

Signed-off-by: wangbowen6 <wangbowen6@xiaomi.com>
---
 drivers/segger/Make.defs                | 1 +
 drivers/segger/config/SEGGER_RTT_Conf.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/segger/Make.defs b/drivers/segger/Make.defs
index 66987408128..1dca76ae32a 100644
--- a/drivers/segger/Make.defs
+++ b/drivers/segger/Make.defs
@@ -30,6 +30,7 @@ ifeq ($(CONFIG_SEGGER_RTT),y)
   CFLAGS += ${shell $(INCDIR) "$(CC)" segger$(DELIM)RTT$(DELIM)RTT}
 
   ifeq ($(CONFIG_ARCH_ARMV7M),y)
+    AFLAGS += ${shell $(INCDIR) "$(CC)" segger$(DELIM)config}
     ASRCS += segger/RTT/RTT/SEGGER_RTT_ASM_ARMv7M.S
   endif
 
diff --git a/drivers/segger/config/SEGGER_RTT_Conf.h b/drivers/segger/config/SEGGER_RTT_Conf.h
index 5de85b92120..a336ab0bda2 100644
--- a/drivers/segger/config/SEGGER_RTT_Conf.h
+++ b/drivers/segger/config/SEGGER_RTT_Conf.h
@@ -27,7 +27,9 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/spinlock.h>
+#ifndef __ASSEMBLY__
+#  include <nuttx/spinlock.h>
+#endif
 
 /****************************************************************************
  * Pre-processor Definitions