diff options
author | Sven Ebenfeld <sven.ebenfeld@gmail.com> | 2016-11-06 16:37:58 +0100 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2017-01-02 17:07:39 +0100 |
commit | 1f6a664802a4044779b9aebe03b9af6d2745de5f (patch) | |
tree | e811711e1c572b100f4e072c3647327a224111af /scripts | |
parent | 3de6c7fc00b3ee3723992506363749d8b726de95 (diff) | |
download | u-boot-1f6a664802a4044779b9aebe03b9af6d2745de5f.tar.gz |
Makefile: preserve output for images that can contain HAB Blocks
To being able to sign created binaries, we need to know the HAB Blocks
for that image. Especially for the imximage type the HAB Blocks are
only available during creation of the image. We want to preserve the
information until we get to sign the files.
In the verbose case we still get them printed out instead of writing
to log files.
Cc: sbabic@denx.de
v2-Changes:
- No usage of MKIMAGEOUTPUT_$(@F) macro.
- Predefine default value /dev/null in every involved Makefile.
Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com>
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.lib | 3 | ||||
-rw-r--r-- | scripts/Makefile.spl | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 348de2dbf8..13c975b8a4 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -487,6 +487,7 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ # # mkimage # --------------------------------------------------------------------------- +MKIMAGEOUTPUT ?= /dev/null quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ - $(if $(KBUILD_VERBOSE:1=), >/dev/null) + $(if $(KBUILD_VERBOSE:1=), >$(MKIMAGEOUTPUT)) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index f379713ad3..c962bbca2c 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -119,9 +119,11 @@ LDPPFLAGS += \ $(shell $(LD) --version | \ sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p') +MKIMAGEOUTPUT ?= /dev/null + quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ - $(if $(KBUILD_VERBOSE:1=), >/dev/null) + $(if $(KBUILD_VERBOSE:1=), >$(MKIMAGEOUTPUT)) MKIMAGEFLAGS_MLO = -T omapimage -a $(CONFIG_SPL_TEXT_BASE) |