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