summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2016-04-05 11:38:49 +0100
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2016-04-08 09:30:20 +0100
commit81d139d5773baf91f6ac5e75078b2c263077f602 (patch)
treef75b162264652ddd869efa52db3fcb0206e6cd52 /Makefile
parent61dbb0285f478dcc0be5eb8c86291e203c9c80c2 (diff)
Remove BL32_BASE when building without SPD for FVP
Previously, when building TF without SPD support, BL2 tried to load a BL32 image from the FIP and fails to find one, which resulted on warning messages on the console. Even if there is a BL32 image in the FIP it shouldn't be loaded because there is no way to transfer control to the Secure Payload without SPD support. The Makefile has been modified to pass a define of the form SPD_${SPD} to the source code the same way it's done for PLAT. The define SPD_none is then used to undefine BL32_BASE when BL32 is not used to prevent BL2 from trying to load a BL32 image and failing, thus removing the warning messages mentioned above. Fixes ARM-software/tf-issues#287 Change-Id: Ifeb6f1c26935efb76afd353fea88e87ba09e9658
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d7a7a36d..a212a935 100644
--- a/Makefile
+++ b/Makefile
@@ -424,6 +424,7 @@ $(eval $(call assert_boolean,PL011_GENERIC_UART))
################################################################################
$(eval $(call add_define,PLAT_${PLAT}))
+$(eval $(call add_define,SPD_${SPD}))
$(eval $(call add_define,NS_TIMER_SWITCH))
$(eval $(call add_define,RESET_TO_BL31))
$(eval $(call add_define,CTX_INCLUDE_FPREGS))