summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2017-05-24 14:20:20 +0100
committerGitHub <noreply@github.com>2017-05-24 14:20:20 +0100
commite715e676e36eda6ef23469b63adb14a98ccce3e0 (patch)
tree9d9b740e84f4fed8fee0f60251298feeb2d6744a /Makefile
parentc1de3fdd32ff1848286fbe642a15f148f6bbf9a3 (diff)
parent232c6b34b5d2147be8765ced7b827ee5b1c1bcb5 (diff)
Merge pull request #938 from masahir0y/tools_share
Collect headers shared between TF and host-tools into include/tools_share
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ddf87561..d9a29bd6 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,8 @@ INCLUDES += -Iinclude/bl1 \
-Iinclude/plat/common \
-Iinclude/services \
${PLAT_INCLUDES} \
- ${SPD_INCLUDES}
+ ${SPD_INCLUDES} \
+ -Iinclude/tools_share
################################################################################
@@ -442,6 +443,7 @@ $(eval $(call assert_boolean,SEPARATE_CODE_AND_RODATA))
$(eval $(call assert_boolean,SPIN_ON_BL1_EXIT))
$(eval $(call assert_boolean,TRUSTED_BOARD_BOOT))
$(eval $(call assert_boolean,USE_COHERENT_MEM))
+$(eval $(call assert_boolean,USE_TBBR_DEFS))
$(eval $(call assert_boolean,WARMBOOT_ENABLE_DCACHE_EARLY))
$(eval $(call assert_numeric,ARM_ARCH_MAJOR))
@@ -480,6 +482,7 @@ $(eval $(call add_define,SPD_${SPD}))
$(eval $(call add_define,SPIN_ON_BL1_EXIT))
$(eval $(call add_define,TRUSTED_BOARD_BOOT))
$(eval $(call add_define,USE_COHERENT_MEM))
+$(eval $(call add_define,USE_TBBR_DEFS))
$(eval $(call add_define,WARMBOOT_ENABLE_DCACHE_EARLY))
# Define the EL3_PAYLOAD_BASE flag only if it is provided.
@@ -603,7 +606,7 @@ certtool: ${CRTTOOL}
.PHONY: ${CRTTOOL}
${CRTTOOL}:
- ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH}
+ ${Q}${MAKE} PLAT=${PLAT} USE_TBBR_DEFS=${USE_TBBR_DEFS} --no-print-directory -C ${CRTTOOLPATH}
@${ECHO_BLANK_LINE}
@echo "Built $@ successfully"
@${ECHO_BLANK_LINE}