Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ee0acfa28351531a2a0f42de84df5e8a24fa6dc4

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 9bf215b035
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: use shorten logs for cat rules 

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

Showing 1 changed file with 15 additions and 8 deletions Side-by-side Diff

... ... @@ -750,14 +750,17 @@
750 750 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
751 751 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
752 752  
  753 +quiet_cmd_cat = CAT $@
  754 +cmd_cat = cat $(filter-out $(PHONY), $^) > $@
  755 +
753 756 all: $(ALL-y)
754 757  
755 758 PHONY += dtbs
756 759 dtbs dts/dt.dtb: checkdtc u-boot
757 760 $(Q)$(MAKE) $(build)=dts dtbs
758 761  
759   -u-boot-dtb.bin: u-boot.bin dts/dt.dtb
760   - cat $^ >$@
  762 +u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE
  763 + $(call if_changed,cat)
761 764  
762 765 OBJCOPYFLAGS_u-boot.hex := -O ihex
763 766  
764 767  
... ... @@ -879,13 +882,13 @@
879 882 rm spl/u-boot-spl-pad.bin
880 883  
881 884 ifeq ($(CONFIG_OF_SEPARATE),y)
882   -u-boot-dtb-tegra.bin: u-boot-nodtb-tegra.bin dts/dt.dtb
883   - cat $^ > $@
  885 +u-boot-dtb-tegra.bin: u-boot-nodtb-tegra.bin dts/dt.dtb FORCE
  886 + $(call if_changed,cat)
884 887 endif
885 888 endif
886 889  
887   -u-boot-img.bin: spl/u-boot-spl.bin u-boot.img
888   - cat spl/u-boot-spl.bin u-boot.img > $@
  890 +u-boot-img.bin: spl/u-boot-spl.bin u-boot.img FORCE
  891 + $(call if_changed,cat)
889 892  
890 893 # PPC4xx needs the SPL at the end of the image, since the reset vector
891 894 # is located at 0xfffffffc. So we can't use the "u-boot-img.bin" target
892 895  
... ... @@ -1053,11 +1056,15 @@
1053 1056 u-boot.lds: $(LDSCRIPT) prepare
1054 1057 $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
1055 1058  
  1059 +PHONY += nand_spl
1056 1060 nand_spl: prepare
1057 1061 $(Q)$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
1058 1062  
1059   -u-boot-nand.bin: nand_spl u-boot.bin
1060   - cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
  1063 +nand_spl/u-boot-spl-16k.bin: nand_spl
  1064 + @:
  1065 +
  1066 +u-boot-nand.bin: nand_spl/u-boot-spl-16k.bin u-boot.bin FORCE
  1067 + $(call if_changed,cat)
1061 1068  
1062 1069 spl/u-boot-spl.bin: tools prepare
1063 1070 $(Q)$(MAKE) obj=spl -f $(srctree)/spl/Makefile all