Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-25 14:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't include mbebtls include paths in INCLUDES

Browse source 
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>
This commit is contained in:
Roberto Vargas 2018-06-04 15:15:04 +01:00
parent 180c4bc2c0
commit ea7a57a3a5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -172,7 +172,7 @@ TF_CFLAGS_aarch64 += -mgeneral-regs-only -mstrict-align
ASFLAGS_aarch32 = $(march32-directive) ASFLAGS_aarch32 = $(march32-directive)
ASFLAGS_aarch64 = -march=armv8-a ASFLAGS_aarch64 = -march=armv8-a
CPPFLAGS = ${DEFINES} ${INCLUDES} -nostdinc \ CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \
-Wmissing-include-dirs -Werror -Wmissing-include-dirs -Werror
ASFLAGS += $(CPPFLAGS) $(ASFLAGS_$(ARCH)) \ ASFLAGS += $(CPPFLAGS) $(ASFLAGS_$(ARCH)) \
-D__ASSEMBLY__ -ffreestanding \ -D__ASSEMBLY__ -ffreestanding \

4
drivers/auth/mbedtls/mbedtls_common.mk
View file

@ -13,8 +13,8 @@ ifeq (${MBEDTLS_DIR},)
$(error Error: MBEDTLS_DIR not set) $(error Error: MBEDTLS_DIR not set)
endif endif
INCLUDES += -I${MBEDTLS_DIR}/include \ MBEDTLS_INC = -I${MBEDTLS_DIR}/include
-Iinclude/drivers/auth/mbedtls INCLUDES += -Iinclude/drivers/auth/mbedtls
# Specify mbed TLS configuration file # Specify mbed TLS configuration file
MBEDTLS_CONFIG_FILE := "<mbedtls_config.h>" MBEDTLS_CONFIG_FILE := "<mbedtls_config.h>"