diff options
| author | Pali Rohár <pali@kernel.org> | 2020-11-04 15:33:44 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-27 16:13:11 -0500 |
| commit | e9ebc17e59217eed457ae83b3c1eec0f7a86daa7 (patch) | |
| tree | 9bdec5693a121b5a785b696094c6bc4ecf4e9f86 /Makefile | |
| parent | 8b195f4b716e4d802768e0e2cd63b417a4690b7f (diff) | |
| download | u-boot-e9ebc17e59217eed457ae83b3c1eec0f7a86daa7.zip u-boot-e9ebc17e59217eed457ae83b3c1eec0f7a86daa7.tar.gz u-boot-e9ebc17e59217eed457ae83b3c1eec0f7a86daa7.tar.bz2 | |
Makefile: Do not call useless command 'true'
Macro 'cmd_objcopy_uboot' currently does not work with passed empty command
expanded from 'cmd_static_rela' and therefore dummy command 'true' is set
in 'cmd_static_rela' to workaround this issue.
Eliminate it now by fixing 'cmd_objcopy_uboot' macro to work also with
empty 'cmd_static_rela' macro and remove useless invocation of command
'true'.
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -885,7 +885,7 @@ cmd_static_rela = \ tools/relocate-rela $(3) $(4) $$start $$end else quiet_cmd_static_rela = -cmd_static_rela = true +cmd_static_rela = endif # Always append INPUTS so that arch config.mk's can add custom ones @@ -1312,7 +1312,11 @@ endif shell_cmd = { $(call echo-cmd,$(1)) $(cmd_$(1)); } quiet_cmd_objcopy_uboot = OBJCOPY $@ +ifdef cmd_static_rela cmd_objcopy_uboot = $(cmd_objcopy) && $(call shell_cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE)) || { rm -f $@; false; } +else +cmd_objcopy_uboot = $(cmd_objcopy) +endif u-boot-nodtb.bin: u-boot FORCE $(call if_changed,objcopy_uboot) |