lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

SEGGER_RTT: solve compile error when enable segger rtt in armv7m.

Browse source 
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>
This commit is contained in:
wangbowen6 2022-03-22 13:10:58 +08:00 committed by Xiang Xiao
parent a91d143944
commit 1b6ce6b4cf
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/segger/Make.defs
View file

@ -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

4
drivers/segger/config/SEGGER_RTT_Conf.h
View file

@ -27,7 +27,9 @@
#include <nuttx/config.h>
#include <nuttx/spinlock.h>
#ifndef __ASSEMBLY__
# include <nuttx/spinlock.h>
#endif
/****************************************************************************
* Pre-processor Definitions