diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-02 16:32:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-02 16:32:05 -0500 |
| commit | 516457013e5a88f65f9d6c11e9171cb03871cc92 (patch) | |
| tree | 583cfafeddbacd1d1a456f49f1e687c4eb8e062c /scripts | |
| parent | 99b02b4dce0b2fc759fb8ced5701c0d4fb7b2200 (diff) | |
| parent | 7c4f0ff81e6fc3b58b8af5f64c3da98624e40132 (diff) | |
| download | u-boot-516457013e5a88f65f9d6c11e9171cb03871cc92.tar.gz u-boot-516457013e5a88f65f9d6c11e9171cb03871cc92.tar.xz u-boot-516457013e5a88f65f9d6c11e9171cb03871cc92.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
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) |