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 | 945b316fa8c562d9f4cb01821fe20fd49dbf9ea3 (patch) | |
| tree | 3f791b143e576c04cd0a78c2ec9c4a9ee7046028 /make_helpers | |
| parent | 1dc0714f10e195fe5fe5aed1f12a0a79f4fc0135 (diff) | |
Build: rip off unneeded $(eval ...) from buid macros
The callers of these macros are supposed to use $(eval $(call, ...)).
The $(eval ...) on the callee side is unneeded.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'make_helpers')
| -rw-r--r-- | make_helpers/build_macros.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 3ca47ed1..85e575c0 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -105,8 +105,8 @@ endef # $(3) = fip target dependency (optional) (i.e. bl31) # $(4) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip) define FIP_ADD_PAYLOAD - $(eval $(4)FIP_ARGS += $(2) $(1)) - $(eval $(if $(3),$(4)FIP_DEPS += $(3))) + $(4)FIP_ARGS += $(2) $(1) + $(if $(3),$(4)FIP_DEPS += $(3)) endef # CERT_ADD_CMD_OPT adds a new command line option to the cert_create invocation @@ -115,8 +115,8 @@ endef # $(3) = input parameter (false if empty) # $(4) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip) define CERT_ADD_CMD_OPT - $(eval $(if $(3),$(4)CRT_DEPS += $(1))) - $(eval $(4)CRT_ARGS += $(2) $(1)) + $(if $(3),$(4)CRT_DEPS += $(1)) + $(4)CRT_ARGS += $(2) $(1) endef # FIP_ADD_IMG allows the platform to specify an image to be packed in the FIP @@ -128,8 +128,8 @@ endef # Example: # $(eval $(call FIP_ADD_IMG,BL33,--nt-fw)) define FIP_ADD_IMG - $(eval $(3)CRT_DEPS += check_$(1)) - $(eval $(3)FIP_DEPS += check_$(1)) + $(3)CRT_DEPS += check_$(1) + $(3)FIP_DEPS += check_$(1) $(call FIP_ADD_PAYLOAD,$(value $(1)),$(2),,$(3)) .PHONY: check_$(1) |