From 34ec84944c2d71adde30ca7c6601ab97b39b6427 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 26 Jan 2018 11:42:01 +0900 Subject: [PATCH] Build: squash MAKE_TOOL_ARGS into MAKE_BL Now, MAKE_TOOL_ARGS is only called from MAKE_BL. Squash it. Signed-off-by: Masahiro Yamada --- make_helpers/build_macros.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 4e69b02d6..97012726e 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -256,16 +256,6 @@ define SOURCES_TO_OBJS $(notdir $(patsubst %.S,%.o,$(filter %.S,$(1)))) endef - -# MAKE_TOOL_ARGS macro defines the command line arguments for fiptool for -# each BL image. Arguments: -# $(1) = BL stage (2, 30, 31, 32, 33) -# $(2) = Binary file -# $(3) = FIP command line option (if empty, image will not be included in the FIP) -define MAKE_TOOL_ARGS - $(if $(3),$(eval $(call FIP_ADD_PAYLOAD,$(2),--$(3),bl$(1)))) -endef - # Allow overriding the timestamp, for example for reproducible builds, or to # synchronize timestamps across multiple projects. # This must be set to a C string (including quotes where applicable). @@ -336,7 +326,7 @@ bl$(1): $(BIN) $(DUMP) all: bl$(1) -$(eval $(call MAKE_TOOL_ARGS,$(1),$(BIN),$(2))) +$(if $(2),$(call FIP_ADD_PAYLOAD,$(BIN),--$(2),bl$(1))) endef -- 2.39.5