V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

kbuild: Add $(Q) when descending into subdirectories 

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2014-02-24 11:12:13 +09:00 committed by Tom Rini
parent 95ddcd68ab
commit 03c7b3fc0b
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -790,7 +790,7 @@ u-boot.img: u-boot.bin
-d $< $@ -d $< $@
u-boot.imx: u-boot.bin 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 u-boot.kwb: u-boot.bin
tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \ 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 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)) $(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 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 \ $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
$(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.ubl: u-boot-with-spl.bin u-boot.ubl: u-boot-with-spl.bin
tools/mkimage -n $(UBL_CONFIG) -T ublimage \ 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 cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais
u-boot.sb: u-boot.bin spl/u-boot-spl.bin u-boot.sb: u-boot.bin spl/u-boot-spl.bin
$(MAKE) $(build)=$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot.sb
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
# Both images are created using mkimage (crc etc), so that the ROM # 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 - <$< >$@ $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
nand_spl: prepare 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 u-boot-nand.bin: nand_spl u-boot.bin
cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
spl/u-boot-spl.bin: tools prepare 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 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 TAG_SUBDIRS := $(u-boot-dirs) include

4
spl/Makefile
View File

@ -177,8 +177,8 @@ $(OBJTREE)/MLO.byteswap: $(obj)/u-boot-spl.bin
$(OBJTREE)/tools/mkimage -T omapimage -n byteswap \ $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
-a $(CONFIG_SPL_TEXT_BASE) -d $< $@ -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
$(objtree)/SPL : $(obj)/u-boot-spl.bin $(objtree)/SPL: $(obj)/u-boot-spl.bin
$(MAKE) $(build)=spl/arch/arm/imx-common $@ $(Q)$(MAKE) $(build)=spl/arch/arm/imx-common $@
ALL-y += $(obj)/$(SPL_BIN).bin ALL-y += $(obj)/$(SPL_BIN).bin