summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-02-24 11:12:13 +0900
committerTom Rini <trini@ti.com>2014-02-25 11:01:28 -0500
commit03c7b3fc0ba9636d3de8db0997f60e96c7494bfc (patch)
tree7a99800f7a38e032e826045e7effeacc21cfcbcc
parent95ddcd68ab54862f416815b9f8c4f584cc0108e2 (diff)
downloadtalos-obmc-uboot-03c7b3fc0ba9636d3de8db0997f60e96c7494bfc.tar.gz
talos-obmc-uboot-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>
-rw-r--r--Makefile21
-rw-r--r--spl/Makefile4
2 files changed, 10 insertions, 15 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
-d $< $@
u-boot.imx: u-boot.bin
- $(MAKE) $(build)=arch/arm/imx-common $(objtree)/u-boot.imx
+ $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
u-boot.kwb: u-boot.bin
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)
tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin
$(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO))
-u-boot-with-spl.imx: spl/u-boot-spl.bin u-boot.bin
- $(MAKE) $(build)=arch/arm/imx-common \
- $(OBJTREE)/u-boot-with-spl.imx
-
-u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
- $(MAKE) $(build)=arch/arm/imx-common \
- $(OBJTREE)/u-boot-with-nand-spl.imx
+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 \
@@ -851,8 +846,8 @@ u-boot.ais: spl/u-boot-spl.bin u-boot.img
cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais
-u-boot.sb: u-boot.bin spl/u-boot-spl.bin
- $(MAKE) $(build)=$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb
+u-boot.sb: u-boot.bin spl/u-boot-spl.bin
+ $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot.sb
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
# Both images are created using mkimage (crc etc), so that the ROM
@@ -1050,16 +1045,16 @@ u-boot.lds: $(LDSCRIPT) prepare
$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
nand_spl: prepare
- $(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
+ $(Q)$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
u-boot-nand.bin: nand_spl u-boot.bin
cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
spl/u-boot-spl.bin: tools prepare
- $(MAKE) obj=spl -f $(srctree)/spl/Makefile all
+ $(Q)$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
tpl/u-boot-tpl.bin: tools prepare
- $(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
+ $(Q)$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
TAG_SUBDIRS := $(u-boot-dirs) include
diff --git a/spl/Makefile b/spl/Makefile
index b9830391f7..df4ecfaf7a 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -177,8 +177,8 @@ $(OBJTREE)/MLO.byteswap: $(obj)/u-boot-spl.bin
$(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
-a $(CONFIG_SPL_TEXT_BASE) -d $< $@
-$(objtree)/SPL : $(obj)/u-boot-spl.bin
- $(MAKE) $(build)=spl/arch/arm/imx-common $@
+$(objtree)/SPL: $(obj)/u-boot-spl.bin
+ $(Q)$(MAKE) $(build)=spl/arch/arm/imx-common $@
ALL-y += $(obj)/$(SPL_BIN).bin
OpenPOWER on IntegriCloud