aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada2014-02-23 20:12:13 -0600
committerTom Rini2014-02-25 10:01:28 -0600
commit03c7b3fc0ba9636d3de8db0997f60e96c7494bfc (patch)
tree7a99800f7a38e032e826045e7effeacc21cfcbcc /Makefile
parent95ddcd68ab54862f416815b9f8c4f584cc0108e2 (diff)
downloadu-boot-03c7b3fc0ba9636d3de8db0997f60e96c7494bfc.tar.gz
u-boot-03c7b3fc0ba9636d3de8db0997f60e96c7494bfc.tar.xz
u-boot-03c7b3fc0ba9636d3de8db0997f60e96c7494bfc.zip
kbuild: Add $(Q) when descending into subdirectories
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 8 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index ad911685bc..05292adcc6 100644
--- a/Makefile
+++ b/Makefile
@@ -790,7 +790,7 @@ u-boot.img: u-boot.bin
790 -d $< $@ 790 -d $< $@
791 791
792u-boot.imx: u-boot.bin 792u-boot.imx: u-boot.bin
793 $(MAKE) $(build)=arch/arm/imx-common $(objtree)/u-boot.imx 793 $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
794 794
795u-boot.kwb: u-boot.bin 795u-boot.kwb: u-boot.bin
796 tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \ 796 tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
@@ -827,13 +827,8 @@ u-boot-with-spl.bin: spl/u-boot-spl.bin $(SPL_PAYLOAD)
827tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin 827tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin
828 $(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO)) 828 $(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO))
829 829
830u-boot-with-spl.imx: spl/u-boot-spl.bin u-boot.bin 830u-boot-with-spl.imx u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
831 $(MAKE) $(build)=arch/arm/imx-common \ 831 $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
832 $(OBJTREE)/u-boot-with-spl.imx
833
834u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
835 $(MAKE) $(build)=arch/arm/imx-common \
836 $(OBJTREE)/u-boot-with-nand-spl.imx
837 832
838u-boot.ubl: u-boot-with-spl.bin 833u-boot.ubl: u-boot-with-spl.bin
839 tools/mkimage -n $(UBL_CONFIG) -T ublimage \ 834 tools/mkimage -n $(UBL_CONFIG) -T ublimage \
@@ -851,8 +846,8 @@ u-boot.ais: spl/u-boot-spl.bin u-boot.img
851 cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais 846 cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais
852 847
853 848
854u-boot.sb: u-boot.bin spl/u-boot-spl.bin 849u-boot.sb: u-boot.bin spl/u-boot-spl.bin
855 $(MAKE) $(build)=$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb 850 $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot.sb
856 851
857# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. 852# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
858# Both images are created using mkimage (crc etc), so that the ROM 853# Both images are created using mkimage (crc etc), so that the ROM
@@ -1050,16 +1045,16 @@ u-boot.lds: $(LDSCRIPT) prepare
1050 $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@ 1045 $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
1051 1046
1052nand_spl: prepare 1047nand_spl: prepare
1053 $(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all 1048 $(Q)$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
1054 1049
1055u-boot-nand.bin: nand_spl u-boot.bin 1050u-boot-nand.bin: nand_spl u-boot.bin
1056 cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin 1051 cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
1057 1052
1058spl/u-boot-spl.bin: tools prepare 1053spl/u-boot-spl.bin: tools prepare
1059 $(MAKE) obj=spl -f $(srctree)/spl/Makefile all 1054 $(Q)$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
1060 1055
1061tpl/u-boot-tpl.bin: tools prepare 1056tpl/u-boot-tpl.bin: tools prepare
1062 $(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y 1057 $(Q)$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
1063 1058
1064TAG_SUBDIRS := $(u-boot-dirs) include 1059TAG_SUBDIRS := $(u-boot-dirs) include
1065 1060