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-apps.git
commit fa6aeb3e128fbb2a97f042db3c76381cc23e2c9a
Author: anjiahao <anjia...@xiaomi.com>
AuthorDate: Wed Oct 19 22:14:10 2022 +0800
mcuboot:move tinycrypt headfile path from make.defs to Makefile
Signed-off-by: anjiahao <anjia...@xiaomi.com>
---
boot/mcuboot/Make.defs | 7 -------
boot/mcuboot/Makefile | 3 +++
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/boot/mcuboot/Make.defs b/boot/mcuboot/Make.defs
index 4dbe2e917..d9e3960dd 100644
--- a/boot/mcuboot/Make.defs
+++ b/boot/mcuboot/Make.defs
@@ -31,11 +31,4 @@ CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboo
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
-# It allows import of MCUboot's crypto backend library headers.
-
-ifneq ($(CONFIG_MCUBOOT_USE_TINYCRYPT),)
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/ext/tinycrypt/lib/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/ext/tinycrypt/lib/include}
-endif
-
endif
diff --git a/boot/mcuboot/Makefile b/boot/mcuboot/Makefile
index 845a50097..dc5042304 100644
--- a/boot/mcuboot/Makefile
+++ b/boot/mcuboot/Makefile
@@ -71,6 +71,9 @@ CSRCS +=
$(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/aes_encrypt.c \
$(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/ecc_dh.c \
$(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/sha256.c \
$(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/utils.c
+
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
mcuboot/ext/tinycrypt/lib/include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
mcuboot/ext/tinycrypt/lib/include}
endif
$(MCUBOOT_TARBALL):
