commit 240935fd5653a0e9b37ab058f699cb1bf35752c9
author wangbowen6 <wangbowen6@xiaomi.com> Tue Mar 22 13:10:58 2022 +0800
committer Xiang Xiao <xiaoxiang781216@gmail.com> Tue Jun 07 19:50:12 2022 +0800
tree 5d3f5d2f6bbec108e074a75ee750ef29e213c6f4
parent c4952b7788e6f5891421a24e27371373c25be7a5

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

diff --git a/drivers/segger/Make.defs b/drivers/segger/Make.defs
index 6698740..1dca76a 100644
--- a/drivers/segger/Make.defs
+++ b/drivers/segger/Make.defs
@@ -30,6 +30,7 @@
   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
 

drivers/segger/config/SEGGER_RTT_Conf.h

diff --git a/drivers/segger/config/SEGGER_RTT_Conf.h b/drivers/segger/config/SEGGER_RTT_Conf.h
index 5de85b9..a336ab0 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