You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/01/29 09:26:20 UTC
[incubator-nuttx] 04/05: segger/RTT: hotfix for RTT compile warning
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8e31fa572a5e7a319f0cbd8dd40396edf48af596
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Jan 26 18:10:29 2022 +0800
segger/RTT: hotfix for RTT compile warning
Signed-off-by: chao.an <an...@xiaomi.com>
---
...include-the-SEGGER_RTT_Conf.h-from-custom.patch | 29 ++++++++++++++++++++++
drivers/segger/Make.defs | 1 +
2 files changed, 30 insertions(+)
diff --git a/drivers/segger/0001-segger-RTT-include-the-SEGGER_RTT_Conf.h-from-custom.patch b/drivers/segger/0001-segger-RTT-include-the-SEGGER_RTT_Conf.h-from-custom.patch
new file mode 100644
index 0000000..d39205c
--- /dev/null
+++ b/drivers/segger/0001-segger-RTT-include-the-SEGGER_RTT_Conf.h-from-custom.patch
@@ -0,0 +1,29 @@
+From 47aaa5806bc4679386de191ede6ffb8982a66975 Mon Sep 17 00:00:00 2001
+From: "chao.an" <an...@xiaomi.com>
+Date: Thu, 27 Jan 2022 12:39:50 +0800
+Subject: [PATCH] segger/RTT: include the SEGGER_RTT_Conf.h from custom path
+
+VELAPLATFO-1419
+
+Change-Id: Idd1d8a38ab38d3e60ee9dddbed26ba8aca510595
+Signed-off-by: chao.an <an...@xiaomi.com>
+---
+ RTT/SEGGER_RTT.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/RTT/SEGGER_RTT.h segger/RTT/RTT/SEGGER_RTT.h
+index a91c36d..744b3a1 100644
+--- a/RTT/SEGGER_RTT.h
++++ segger/RTT/RTT/SEGGER_RTT.h
+@@ -58,7 +58,7 @@ Revision: $Rev: 24324 $
+ #ifndef SEGGER_RTT_H
+ #define SEGGER_RTT_H
+
+-#include "../Config/SEGGER_RTT_Conf.h"
++#include "SEGGER_RTT_Conf.h"
+
+ /*********************************************************************
+ *
+--
+2.25.1
+
diff --git a/drivers/segger/Make.defs b/drivers/segger/Make.defs
index 4edadb8..11e343d 100644
--- a/drivers/segger/Make.defs
+++ b/drivers/segger/Make.defs
@@ -39,6 +39,7 @@ $(SGDIR)/RTT.zip:
$(Q) curl -L https://github.com/SEGGERMicro/RTT/archive/refs/tags/V$(RTT_VERSION).zip -o $(SGDIR)/RTT.zip
$(Q) unzip -o $(SGDIR)/RTT.zip -d $(SGDIR)
$(Q) mv $(SGDIR)/RTT-$(RTT_VERSION) $(SGDIR)/RTT
+ $(Q) patch -p0 < segger/0001-segger-RTT-include-the-SEGGER_RTT_Conf.h-from-custom.patch
TARGET_ZIP += $(SGDIR)/RTT.zip