diff mbox series

Makefile: Silence relocate-rela call

Message ID fc475831-95cc-8eab-27ac-4e3329078410@siemens.com
State Accepted
Commit 7125d2c195fb556afc126c06c4c020e3ea93fc57
Delegated to: Tom Rini
Headers show
Series Makefile: Silence relocate-rela call | expand

Commit Message

Jan Kiszka June 25, 2020, 6:39 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Tom Rini July 17, 2020, 8:57 p.m. UTC | #1 
On Thu, Jun 25, 2020 at 08:39:45AM +0200, Jan Kiszka wrote:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index e3c18d8c39..6d2f5bc091 100644
--- a/Makefile
+++ b/Makefile
@@ -872,12 +872,14 @@  endif
 # do the relocation).
 ifneq ($(CONFIG_STATIC_RELA),)
 # $(1) is u-boot ELF, $(2) is u-boot bin, $(3) is text base
-DO_STATIC_RELA = \
-	start=$$($(NM) $(1) | grep __rel_dyn_start | cut -f 1 -d ' '); \
-	end=$$($(NM) $(1) | grep __rel_dyn_end | cut -f 1 -d ' '); \
-	tools/relocate-rela $(2) $(3) $$start $$end
+quiet_cmd_static_rela = RELOC   $@
+cmd_static_rela = \
+	start=$$($(NM) $(2) | grep __rel_dyn_start | cut -f 1 -d ' '); \
+	end=$$($(NM) $(2) | grep __rel_dyn_end | cut -f 1 -d ' '); \
+	tools/relocate-rela $(3) $(4) $$start $$end
 else
-DO_STATIC_RELA =
+quiet_cmd_static_rela =
+cmd_static_rela =
 endif
 
 # Always append ALL so that arch config.mk's can add custom ones
@@ -1284,7 +1286,7 @@  endif
 
 u-boot-nodtb.bin: u-boot FORCE
 	$(call if_changed,objcopy)
-	$(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE))
+	$(call cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE))
 	$(BOARD_SIZE_CHECK)
 
 u-boot.ldr:	u-boot