Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 03c7b3fc0ba9636d3de8db0997f60e96c7494bfc

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 95ddcd68ab
Exists in master and in 49 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

kbuild: Add $(Q) when descending into subdirectories 

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>

Showing 2 changed files with 10 additions and 15 deletions Side-by-side Diff

... ... @@ -790,7 +790,7 @@
790 790 -d $< $@
791 791  
792 792 u-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  
795 795 u-boot.kwb: u-boot.bin
796 796 tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
797 797  
... ... @@ -827,14 +827,9 @@
827 827 tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin
828 828 $(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO))
829 829  
830   -u-boot-with-spl.imx: spl/u-boot-spl.bin u-boot.bin
831   - $(MAKE) $(build)=arch/arm/imx-common \
832   - $(OBJTREE)/u-boot-with-spl.imx
  830 +u-boot-with-spl.imx u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
  831 + $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
833 832  
834   -u-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   -
838 833 u-boot.ubl: u-boot-with-spl.bin
839 834 tools/mkimage -n $(UBL_CONFIG) -T ublimage \
840 835 -e $(CONFIG_SYS_TEXT_BASE) -d $< u-boot.ubl
... ... @@ -851,8 +846,8 @@
851 846 cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais
852 847  
853 848  
854   -u-boot.sb: u-boot.bin spl/u-boot-spl.bin
855   - $(MAKE) $(build)=$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb
  849 +u-boot.sb: u-boot.bin spl/u-boot-spl.bin
  850 + $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot.sb
856 851  
857 852 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
858 853 # Both images are created using mkimage (crc etc), so that the ROM
859 854  
860 855  
... ... @@ -1050,16 +1045,16 @@
1050 1045 $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
1051 1046  
1052 1047 nand_spl: prepare
1053   - $(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
  1048 + $(Q)$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
1054 1049  
1055 1050 u-boot-nand.bin: nand_spl u-boot.bin
1056 1051 cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
1057 1052  
1058 1053 spl/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  
1061 1056 tpl/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  
1064 1059 TAG_SUBDIRS := $(u-boot-dirs) include
1065 1060  
... ... @@ -177,8 +177,8 @@
177 177 $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
178 178 -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
179 179  
180   -$(objtree)/SPL : $(obj)/u-boot-spl.bin
181   - $(MAKE) $(build)=spl/arch/arm/imx-common $@
  180 +$(objtree)/SPL: $(obj)/u-boot-spl.bin
  181 + $(Q)$(MAKE) $(build)=spl/arch/arm/imx-common $@
182 182  
183 183 ALL-y += $(obj)/$(SPL_BIN).bin
184 184