diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-08-27 14:29:00 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-24 18:30:27 -0400 |
| commit | bdc7dc4595646da8774f53a2c4f5a7599b0a5f16 (patch) | |
| tree | 9063c63726d8ef6edc9f8b56e4e79763872a1ef4 /tools | |
| parent | e5bf9878ea743564bcc7a15a79654fe06731a1e2 (diff) | |
| download | blackbird-obmc-uboot-bdc7dc4595646da8774f53a2c4f5a7599b0a5f16.tar.gz blackbird-obmc-uboot-bdc7dc4595646da8774f53a2c4f5a7599b0a5f16.zip | |
tools/env: change stripping strategy to allow no-stripping
When building the U-Boot tools for non-ELF platforms (such as Blackfin
FLAT), since commit 79fc0c5f498c3982aa4740c273ab1a9255063d9c
("tools/env: cross-compile fw_printenv without setting HOSTCC"), the
build fails because it tries to strip a FLAT binary, which does not
make sense.
This commit solves this by changing the stripping logic in
tools/env/Makefile to be similar to the one in tools/Makefile. This
logic continues to apply strip to the final binary, but does not abort
the build if it fails, and does the stripping in place on the final
binary. This allows the logic to work fine if stripping doesn't work,
as it leaves the final binary untouched.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Sonic Zhang <sonic.zhang@analog.com>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/env/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/env/Makefile b/tools/env/Makefile index 4927489b16..40164f7a35 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -21,14 +21,16 @@ HOST_EXTRACFLAGS += -DMTD_OLD endif always := fw_printenv -hostprogs-y := fw_printenv_unstripped +hostprogs-y := fw_printenv -fw_printenv_unstripped-objs := fw_env.o fw_env_main.o \ +fw_printenv-objs := fw_env.o fw_env_main.o \ crc32.o ctype.o linux_string.o \ env_attr.o env_flags.o aes.o -quiet_cmd_strip = STRIP $@ - cmd_strip = $(STRIP) -o $@ $< +quiet_cmd_crosstools_strip = STRIP $^ + cmd_crosstools_strip = $(STRIP) $^; touch $@ -$(obj)/fw_printenv: $(obj)/fw_printenv_unstripped FORCE - $(call if_changed,strip) +$(obj)/.strip: $(obj)/fw_printenv + $(call cmd,crosstools_strip) + +always += .strip |
