kbuild: use shorten logs for mkimage rules

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/Makefile b/Makefile
index 7a179cda41ccbb807fbceb9c6a52f1c304d26afc..f3bdcf00f4d20cade940f8866b7e875f997cebd0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -746,6 +746,10 @@ endif
 quiet_cmd_objcopy = OBJCOPY $@
 cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 
+quiet_cmd_mkimage = UIMAGE  $@
+cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+       $(if $(KBUILD_VERBOSE:1=), >/dev/null)
+
 all:           $(ALL-y)
 
 PHONY += dtbs
@@ -789,24 +793,21 @@ ifndef CONFIG_SYS_UBOOT_START
 CONFIG_SYS_UBOOT_START := 0
 endif
 
-u-boot.img:    u-boot.bin
-               tools/mkimage -A $(ARCH) -T firmware -C none \
-               -O u-boot -a $(CONFIG_SYS_TEXT_BASE) \
-               -e $(CONFIG_SYS_UBOOT_START) \
-               -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" \
-               -d $< $@
+MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \
+       -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
+       -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board"
 
-u-boot.imx: u-boot.bin
-       $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
+MKIMAGEFLAGS_u-boot.kwb = -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
+               -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
 
-u-boot.kwb:       u-boot.bin
-               tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
-               -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
+MKIMAGEFLAGS_u-boot.pbl = -n $(CONFIG_SYS_FSL_PBL_RCW) \
+               -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage
 
-u-boot.pbl:    u-boot.bin
-               tools/mkimage -n $(CONFIG_SYS_FSL_PBL_RCW) \
-               -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage \
-               -d $< $@
+u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
+       $(call if_changed,mkimage)
+
+u-boot.imx: u-boot.bin
+       $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
 
 u-boot.sha1:   u-boot.bin
                tools/ubsha1 u-boot.bin
@@ -837,9 +838,10 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin
 u-boot-with-spl.imx u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
        $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
 
-u-boot.ubl:       u-boot-with-spl.bin
-               tools/mkimage -n $(UBL_CONFIG) -T ublimage \
-               -e $(CONFIG_SYS_TEXT_BASE) -d $< u-boot.ubl
+MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE)
+
+u-boot.ubl: u-boot-with-spl.bin FORCE
+       $(call if_changed,mkimage)
 
 u-boot.ais:       spl/u-boot-spl.bin u-boot.img
                tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(srctree)/$(CONFIG_AIS_CONFIG_FILE:"%"=%),"/dev/null") \

diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk
index 1c06fb40a4f62e45503d8b042ea5c6465a0a2412..5294d16708c45b80905d36d9d7245d71523392bd 100644 (file)
--- a/arch/arm/cpu/armv7/am33xx/config.mk
+++ b/arch/arm/cpu/armv7/am33xx/config.mk
@@ -4,8 +4,8 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 ifdef CONFIG_SPL_BUILD
-ALL-y  += $(OBJTREE)/MLO
-ALL-$(CONFIG_SPL_SPI_SUPPORT) += $(OBJTREE)/MLO.byteswap
+ALL-y  += MLO
+ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap
 else
 ALL-y  += u-boot.img
 endif

diff --git a/arch/arm/cpu/armv7/omap3/config.mk b/arch/arm/cpu/armv7/omap3/config.mk
index 2a3d1c5c3a5385dd690ebf34b046bdd2b79d676f..ad44d638401433f298ef61bdbf9179989a00ff0f 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/config.mk
+++ b/arch/arm/cpu/armv7/omap3/config.mk
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 ifdef CONFIG_SPL_BUILD
-ALL-y  += $(OBJTREE)/MLO
+ALL-y  += MLO
 else
 ALL-y  += u-boot.img
 endif

diff --git a/arch/arm/cpu/armv7/omap4/config.mk b/arch/arm/cpu/armv7/omap4/config.mk
index 2a3d1c5c3a5385dd690ebf34b046bdd2b79d676f..ad44d638401433f298ef61bdbf9179989a00ff0f 100644 (file)
--- a/arch/arm/cpu/armv7/omap4/config.mk
+++ b/arch/arm/cpu/armv7/omap4/config.mk
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 ifdef CONFIG_SPL_BUILD
-ALL-y  += $(OBJTREE)/MLO
+ALL-y  += MLO
 else
 ALL-y  += u-boot.img
 endif

diff --git a/arch/arm/cpu/armv7/omap5/config.mk b/arch/arm/cpu/armv7/omap5/config.mk
index 261b272234a507dfe8fe1cd24aa57ba4f6925248..ef2725affa33fff6252c33672415934a4dc5381b 100644 (file)
--- a/arch/arm/cpu/armv7/omap5/config.mk
+++ b/arch/arm/cpu/armv7/omap5/config.mk
@@ -7,7 +7,7 @@
 #
 
 ifdef CONFIG_SPL_BUILD
-ALL-y  += $(OBJTREE)/MLO
+ALL-y  += MLO
 else
 ALL-y  += u-boot.img
 endif

diff --git a/spl/Makefile b/spl/Makefile
index 94e721f4732364fe0de49c832139af533ddca622..542a2b08f6ca265881e2a1953d14f77a08e2c8d2 100644 (file)
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -169,13 +169,16 @@ 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')
 
-$(OBJTREE)/MLO:        $(obj)/u-boot-spl.bin
-       $(OBJTREE)/tools/mkimage -T omapimage \
-               -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
+quiet_cmd_mkimage = UIMAGE  $@
+cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+       $(if $(KBUILD_VERBOSE:1=), >/dev/null)
 
-$(OBJTREE)/MLO.byteswap: $(obj)/u-boot-spl.bin
-       $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
-               -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
+MKIMAGEFLAGS_MLO = -T omapimage -a $(CONFIG_SPL_TEXT_BASE)
+
+MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE)
+
+MLO MLO.byteswap: $(obj)/u-boot-spl.bin
+       $(call if_changed,mkimage)
 
 $(objtree)/SPL: $(obj)/u-boot-spl.bin
        $(Q)$(MAKE) $(build)=spl/arch/arm/imx-common $@