diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | plat/arm/css/common/css_common.mk | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -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)),\ diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk index 86ba6df5..7829e8b2 100644 --- a/plat/arm/css/common/css_common.mk +++ b/plat/arm/css/common/css_common.mk @@ -64,7 +64,7 @@ $(eval $(call assert_boolean,CSS_LOAD_SCP_IMAGES)) $(eval $(call add_define,CSS_LOAD_SCP_IMAGES)) ifeq (${CSS_LOAD_SCP_IMAGES},1) - $(eval $(call FIP_ADD_IMG,SCP_BL2,--scp-fw)) + NEED_SCP_BL2 := yes ifneq (${TRUSTED_BOARD_BOOT},0) $(eval $(call FWU_FIP_ADD_IMG,SCP_BL2U,--scp-fwu-cfg)) endif |