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 | 10cea934560663209765e88af671969a2cf9eb5f (patch) | |
| tree | 2e4a2244115769054f3ab5b4c17dfda84eef50bb /make_helpers/build_macros.mk | |
| parent | f30ee0b9c07badc226fc36c4ac791ae65b837f45 (diff) | |
Build: rename FIP_ADD_PAYLOAD to TOOL_ADD_PAYLOAD
Now FIP_ADD_PAYLOAD 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 'make_helpers/build_macros.mk')
| -rw-r--r-- | make_helpers/build_macros.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index e0d107fc..412f9cdd 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -98,13 +98,14 @@ define IMG_BIN ${BUILD_PLAT}/bl$(1).bin endef -# FIP_ADD_PAYLOAD appends the command line arguments required by fiptool -# to package a new payload. Optionally, it adds the dependency on this payload +# TOOL_ADD_PAYLOAD appends the command line arguments required by fiptool to +# package a new payload and/or by cert_create to generate certificate. +# Optionally, it adds the dependency on this payload # $(1) = payload filename (i.e. bl31.bin) # $(2) = command line option for the specified payload (i.e. --soc-fw) -# $(3) = fip target dependency (optional) (i.e. bl31) +# $(3) = tool target dependency (optional) (i.e. bl31) # $(4) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip) -define FIP_ADD_PAYLOAD +define TOOL_ADD_PAYLOAD $(4)FIP_ARGS += $(2) $(1) $(if $(3),$(4)FIP_DEPS += $(3)) $(4)CRT_ARGS += $(2) $(1) @@ -132,7 +133,7 @@ endef define FIP_ADD_IMG $(3)CRT_DEPS += check_$(1) $(3)FIP_DEPS += check_$(1) - $(call FIP_ADD_PAYLOAD,$(value $(1)),$(2),,$(3)) + $(call TOOL_ADD_PAYLOAD,$(value $(1)),$(2),,$(3)) .PHONY: check_$(1) check_$(1): @@ -297,7 +298,7 @@ bl$(1): $(BIN) $(DUMP) all: bl$(1) -$(if $(2),$(call FIP_ADD_PAYLOAD,$(BIN),--$(2),bl$(1),$(3))) +$(if $(2),$(call TOOL_ADD_PAYLOAD,$(BIN),--$(2),bl$(1),$(3))) endef |