summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2017-04-14 01:49:34 +0100
committerGitHub <noreply@github.com>2017-04-14 01:49:34 +0100
commitea69a93e72e61053c373c69be4f9c336ca60218d (patch)
tree264d524d015179ecf32e4c579fc76b8506db3dfe /Makefile
parent5d385355f1405ccb82aabbb9b8afb1520df25438 (diff)
parent4d045d0ebb7bca8b9900b250d32195160e7fdd5a (diff)
Merge pull request #890 from masahir0y/scp
Build: add generic way to include SCP_BL2 into FIP image
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 9 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 9f9061c4..02aa50e3 100644
--- a/Makefile
+++ b/Makefile
@@ -347,6 +347,11 @@ ifdef BL2_SOURCES
endif
endif
+# If SCP_BL2 is given, we always want FIP to include it.
+ifdef SCP_BL2
+ NEED_SCP_BL2 := yes
+endif
+
# Process TBB related flags
ifneq (${GENERATE_COT},0)
# Common cert_create options
@@ -541,6 +546,10 @@ $(if ${BL2}, $(eval $(call MAKE_TOOL_ARGS,2,${BL2},tb-fw)),\
$(eval $(call MAKE_BL,2,tb-fw)))
endif
+ifeq (${NEED_SCP_BL2},yes)
+$(eval $(call FIP_ADD_IMG,SCP_BL2,--scp-fw))
+endif
+
ifeq (${NEED_BL31},yes)
BL31_SOURCES += ${SPD_SOURCES}
$(if ${BL31}, $(eval $(call MAKE_TOOL_ARGS,31,${BL31},soc-fw)),\