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>
This commit is contained in:
parent
10cea93456
commit
c939d13a8c
14
Makefile
14
Makefile
|
@ -598,38 +598,38 @@ ifeq (${BL2_AT_EL3}, 0)
|
|||
FIP_BL2_ARGS := tb-fw
|
||||
endif
|
||||
|
||||
$(if ${BL2}, $(eval $(call FIP_ADD_IMG,BL2,--${FIP_BL2_ARGS})),\
|
||||
$(if ${BL2}, $(eval $(call TOOL_ADD_IMG,BL2,--${FIP_BL2_ARGS})),\
|
||||
$(eval $(call MAKE_BL,2,${FIP_BL2_ARGS})))
|
||||
endif
|
||||
|
||||
ifeq (${NEED_SCP_BL2},yes)
|
||||
$(eval $(call FIP_ADD_IMG,SCP_BL2,--scp-fw))
|
||||
$(eval $(call TOOL_ADD_IMG,SCP_BL2,--scp-fw))
|
||||
endif
|
||||
|
||||
ifeq (${NEED_BL31},yes)
|
||||
BL31_SOURCES += ${SPD_SOURCES}
|
||||
$(if ${BL31}, $(eval $(call FIP_ADD_IMG,BL31,--soc-fw)),\
|
||||
$(if ${BL31}, $(eval $(call TOOL_ADD_IMG,BL31,--soc-fw)),\
|
||||
$(eval $(call MAKE_BL,31,soc-fw)))
|
||||
endif
|
||||
|
||||
# If a BL32 image is needed but neither BL32 nor BL32_SOURCES is defined, the
|
||||
# build system will call FIP_ADD_IMG to print a warning message and abort the
|
||||
# build system will call TOOL_ADD_IMG to print a warning message and abort the
|
||||
# process. Note that the dependency on BL32 applies to the FIP only.
|
||||
ifeq (${NEED_BL32},yes)
|
||||
|
||||
BUILD_BL32 := $(if $(BL32),,$(if $(BL32_SOURCES),1))
|
||||
|
||||
$(if ${BUILD_BL32}, $(eval $(call MAKE_BL,32,tos-fw)),\
|
||||
$(eval $(call FIP_ADD_IMG,BL32,--tos-fw)))
|
||||
$(eval $(call TOOL_ADD_IMG,BL32,--tos-fw)))
|
||||
endif
|
||||
|
||||
# Add the BL33 image if required by the platform
|
||||
ifeq (${NEED_BL33},yes)
|
||||
$(eval $(call FIP_ADD_IMG,BL33,--nt-fw))
|
||||
$(eval $(call TOOL_ADD_IMG,BL33,--nt-fw))
|
||||
endif
|
||||
|
||||
ifeq (${NEED_BL2U},yes)
|
||||
$(if ${BL2U}, $(eval $(call FIP_ADD_IMG,BL2U,--ap-fwu-cfg,FWU_)),\
|
||||
$(if ${BL2U}, $(eval $(call TOOL_ADD_IMG,BL2U,--ap-fwu-cfg,FWU_)),\
|
||||
$(eval $(call MAKE_BL,2u,ap-fwu-cfg,FWU_)))
|
||||
endif
|
||||
|
||||
|
|
|
@ -122,15 +122,15 @@ define CERT_ADD_CMD_OPT
|
|||
$(4)CRT_ARGS += $(2) $(1)
|
||||
endef
|
||||
|
||||
# FIP_ADD_IMG allows the platform to specify an image to be packed in the FIP
|
||||
# using a build option. It also adds a dependency on the image file, aborting
|
||||
# the build if the file does not exist.
|
||||
# TOOL_ADD_IMG allows the platform to specify an external image to be packed
|
||||
# in the FIP and/or for which certificate is generated. It also adds a
|
||||
# dependency on the image file, aborting the build if the file does not exist.
|
||||
# $(1) = build option to specify the image filename (SCP_BL2, BL33, etc)
|
||||
# $(2) = command line option for fiptool (--scp-fw, --nt-fw, etc)
|
||||
# $(3) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip)
|
||||
# Example:
|
||||
# $(eval $(call FIP_ADD_IMG,BL33,--nt-fw))
|
||||
define FIP_ADD_IMG
|
||||
# $(eval $(call TOOL_ADD_IMG,BL33,--nt-fw))
|
||||
define TOOL_ADD_IMG
|
||||
$(3)CRT_DEPS += check_$(1)
|
||||
$(3)FIP_DEPS += check_$(1)
|
||||
$(call TOOL_ADD_PAYLOAD,$(value $(1)),$(2),,$(3))
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
@ -36,10 +36,10 @@ $(eval $(call add_define,PLAT_PARTITION_MAX_ENTRIES))
|
|||
# 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_PLAT_COMPAT := 0
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
@ -29,10 +29,10 @@ $(eval $(call add_define,CRASH_CONSOLE_BASE))
|
|||
# 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_PLAT_COMPAT := 0
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
@ -133,10 +133,10 @@ BL31_SOURCES += lib/cpus/aarch64/aem_generic.S \
|
|||
# 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
|
||||
|
||||
# Disable the PSCI platform compatibility layer
|
||||
|
|
Loading…
Reference in New Issue