diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-01-26 11:42:01 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-02-01 20:20:03 +0900 |
| commit | c939d13a8c0ad49a41d3c1e3e308eed8bac383d4 (patch) | |
| tree | e6ac82abba79366a3f17702865616704f66990e7 /plat/arm | |
| parent | 10cea934560663209765e88af671969a2cf9eb5f (diff) | |
Build: rename FIP_ADD_IMG to TOOL_ADD_IMG
Now FIP_ADD_IMG takes care of both fiptool and cert_create
symmetrically. Rename it so that it matches the behavior.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/common/arm_common.mk | 6 | ||||
| -rw-r--r-- | plat/arm/css/common/css_common.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 09c87b53..33fa5743 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -87,10 +87,10 @@ $(eval $(call add_define,MBEDTLS_SHA256_SMALLER)) # Add the build options to pack Trusted OS Extra1 and Trusted OS Extra2 images # in the FIP if the platform requires. ifneq ($(BL32_EXTRA1),) -$(eval $(call FIP_ADD_IMG,BL32_EXTRA1,--tos-fw-extra1)) +$(eval $(call TOOL_ADD_IMG,BL32_EXTRA1,--tos-fw-extra1)) endif ifneq ($(BL32_EXTRA2),) -$(eval $(call FIP_ADD_IMG,BL32_EXTRA2,--tos-fw-extra2)) +$(eval $(call TOOL_ADD_IMG,BL32_EXTRA2,--tos-fw-extra2)) endif # Enable PSCI_STAT_COUNT/RESIDENCY APIs on ARM platforms @@ -211,7 +211,7 @@ ifneq (${TRUSTED_BOARD_BOOT},0) BL2_SOURCES += ${AUTH_SOURCES} \ plat/common/tbbr/plat_tbbr.c - $(eval $(call FIP_ADD_IMG,NS_BL2U,--fwu,FWU_)) + $(eval $(call TOOL_ADD_IMG,NS_BL2U,--fwu,FWU_)) # We expect to locate the *.mk files under the directories specified below ifeq (${ARM_CRYPTOCELL_INTEG},0) diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk index 4232a441..4f311c34 100644 --- a/plat/arm/css/common/css_common.mk +++ b/plat/arm/css/common/css_common.mk @@ -49,7 +49,7 @@ $(eval $(call add_define,CSS_LOAD_SCP_IMAGES)) ifeq (${CSS_LOAD_SCP_IMAGES},1) NEED_SCP_BL2 := yes ifneq (${TRUSTED_BOARD_BOOT},0) - $(eval $(call FIP_ADD_IMG,SCP_BL2U,--scp-fwu-cfg,FWU_)) + $(eval $(call TOOL_ADD_IMG,SCP_BL2U,--scp-fwu-cfg,FWU_)) endif ifeq (${CSS_USE_SCMI_SDS_DRIVER},1) |