diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
| commit | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch) | |
| tree | bbb554b1128dc15453a91fc50408446da2e0ddd2 /Makefile | |
| parent | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff) | |
| parent | 21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff) | |
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to:
- Correct fixdep and CONFIG_IS_ENABLED(...)
- lz4 on big endian
- Assorted LMB hardening
- Remove bd_t typedef
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -875,12 +875,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 @@ -1287,7 +1289,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 |