Don't include mbebtls include paths in INCLUDES

Mbebtls include paths are controlled by the user using the variable
MBEDTLS_DIR and they are out of the TF source tree. Since these
includes have a different origin it is better to move them to a
different variable.

This change makes easier for the romlib Makefile to parse the include
paths.

Change-Id: I3e4c99300f1012bc7f88c6b9f5bc0ec1f7b5aa8d
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>

diff --git a/Makefile b/Makefile
index 9c0ab722e88612d953b497bb94e2d6c9d37ddfee..8a1ff9441e5a739a0fe0bbb01959cb4721b7d70f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,7 @@ TF_CFLAGS_aarch64   +=      -mgeneral-regs-only -mstrict-align
 ASFLAGS_aarch32                =       $(march32-directive)
 ASFLAGS_aarch64                =       -march=armv8-a
 
-CPPFLAGS               =       ${DEFINES} ${INCLUDES} -nostdinc                \
+CPPFLAGS               =       ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc         \
                                -Wmissing-include-dirs -Werror
 ASFLAGS                        +=      $(CPPFLAGS) $(ASFLAGS_$(ARCH))                  \
                                -D__ASSEMBLY__ -ffreestanding                   \

diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk
index 67a5da2b18b2954166fca076f00915f06d89df39..71c496eda4a78c7cfedbbeeac6abfe71560be323 100644 (file)
--- a/drivers/auth/mbedtls/mbedtls_common.mk
+++ b/drivers/auth/mbedtls/mbedtls_common.mk
@@ -13,8 +13,8 @@ ifeq (${MBEDTLS_DIR},)
   $(error Error: MBEDTLS_DIR not set)
 endif
 
-INCLUDES               +=      -I${MBEDTLS_DIR}/include                \
-                               -Iinclude/drivers/auth/mbedtls
+MBEDTLS_INC            =       -I${MBEDTLS_DIR}/include
+INCLUDES               +=     -Iinclude/drivers/auth/mbedtls
 
 # Specify mbed TLS configuration file
 MBEDTLS_CONFIG_FILE    :=      "<mbedtls_config.h>"