Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4e0c8abcdd8748b20e1652bd35351d077baad2f2

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 04a34c96b1
Exists in master and in 50 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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 IMX images 

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

Showing 6 changed files with 58 additions and 41 deletions Side-by-side Diff

... ... @@ -815,7 +815,7 @@
815 815 $(call if_changed,mkimage)
816 816  
817 817 u-boot.imx: u-boot.bin
818   - $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
  818 + $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
819 819  
820 820 u-boot.sha1: u-boot.bin
821 821 tools/ubsha1 u-boot.bin
... ... @@ -840,7 +840,7 @@
840 840 $(call if_changed,pad_cat)
841 841  
842 842 u-boot-with-spl.imx u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
843   - $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
  843 + $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
844 844  
845 845 MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE)
846 846  
arch/arm/cpu/arm1136/config.mk
Diff comments   View file @ 4e0c8ab
... ... @@ -11,7 +11,7 @@
11 11 ifneq ($(CONFIG_IMX_CONFIG),)
12 12 ifdef CONFIG_SPL
13 13 ifdef CONFIG_SPL_BUILD
14   -ALL-y += $(OBJTREE)/SPL
  14 +ALL-y += SPL
15 15 endif
16 16 else
17 17 ALL-y += u-boot.imx
arch/arm/cpu/arm926ejs/config.mk
Diff comments   View file @ 4e0c8ab
... ... @@ -10,7 +10,7 @@
10 10 ifneq ($(CONFIG_IMX_CONFIG),)
11 11 ifdef CONFIG_SPL
12 12 ifdef CONFIG_SPL_BUILD
13   -ALL-y += $(OBJTREE)/SPL
  13 +ALL-y += SPL
14 14 endif
15 15 else
16 16 ALL-y += u-boot.imx
arch/arm/cpu/armv7/config.mk
Diff comments   View file @ 4e0c8ab
... ... @@ -17,7 +17,7 @@
17 17 ifneq ($(CONFIG_IMX_CONFIG),)
18 18 ifdef CONFIG_SPL
19 19 ifdef CONFIG_SPL_BUILD
20   -ALL-y += $(OBJTREE)/SPL
  20 +ALL-y += SPL
21 21 endif
22 22 else
23 23 ALL-y += u-boot.imx
arch/arm/imx-common/Makefile
Diff comments   View file @ 4e0c8ab
... ... @@ -23,38 +23,55 @@
23 23 obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o
24 24 obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
25 25  
26   -$(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp : $(SRCTREE)/%
27   - mkdir -p $(dir $@)
28   - $(CPP) $(cpp_flags) -x c -o $@ $<
  26 +quiet_cmd_cpp_cfg = CFGS $@
  27 + cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $<
29 28  
30   -$(OBJTREE)/u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
31   - $(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \
32   - -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
  29 +IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp
33 30  
34   -$(OBJTREE)/SPL: $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
35   - $(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \
36   - -e $(CONFIG_SPL_TEXT_BASE) -d $< $@
  31 +$(IMX_CONFIG): %.cfgtmp: % FORCE
  32 + $(Q)mkdir -p $(dir $@)
  33 + $(call if_changed_dep,cpp_cfg)
37 34  
38   -$(OBJTREE)/u-boot-with-spl.imx: $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin
39   - $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(CONFIG_SPL_PAD_TO) \
40   - -I binary -O binary $< $(OBJTREE)/spl/u-boot-spl-pad.imx
41   - $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
42   - -e $(CONFIG_SYS_TEXT_BASE) -C none -d $(OBJTREE)/u-boot.bin \
43   - $(OBJTREE)/u-boot.uim
44   - cat $(OBJTREE)/spl/u-boot-spl-pad.imx $(OBJTREE)/u-boot.uim > $@
45   - rm $(OBJTREE)/spl/u-boot-spl-pad.imx $(OBJTREE)/u-boot.uim
  35 +quiet_cmd_mkimage = UIMAGE $@
  36 +cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
  37 + $(if $(KBUILD_VERBOSE:1=), >/dev/null)
46 38  
47   -$(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin
48   - (echo -ne '\x00\x00\x00\x00\x46\x43\x42\x20\x01' && \
49   - dd bs=1015 count=1 if=/dev/zero 2>/dev/null) | \
50   - cat - $< > $(OBJTREE)/spl/u-boot-nand-spl.imx
51   - $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(CONFIG_SPL_PAD_TO) \
52   - -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \
53   - $(OBJTREE)/spl/u-boot-nand-spl-pad.imx
54   - rm $(OBJTREE)/spl/u-boot-nand-spl.imx
55   - $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
56   - -e $(CONFIG_SYS_TEXT_BASE) -C none -d $(OBJTREE)/u-boot.bin \
57   - $(OBJTREE)/u-boot.uim
58   - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > $@
59   - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim
  39 +MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $< $(PHONY),$^) -T imximage \
  40 + -e $(CONFIG_SYS_TEXT_BASE)
  41 +
  42 +u-boot.imx: u-boot.bin $(IMX_CONFIG) FORCE
  43 + $(call if_changed,mkimage)
  44 +
  45 +MKIMAGEFLAGS_SPL = -n $(filter-out $< $(PHONY),$^) -T imximage \
  46 + -e $(CONFIG_SPL_TEXT_BASE)
  47 +
  48 +SPL: spl/u-boot-spl.bin $(IMX_CONFIG) FORCE
  49 + $(call if_changed,mkimage)
  50 +
  51 +MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
  52 + -e $(CONFIG_SYS_TEXT_BASE) -C none
  53 +
  54 +u-boot.uim: u-boot.bin FORCE
  55 + $(call if_changed,mkimage)
  56 +
  57 +OBJCOPYFLAGS += -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
  58 +append = cat $(filter-out $< $(PHONY), $^) >> $@
  59 +
  60 +quiet_cmd_pad_cat = CAT $@
  61 +cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
  62 +
  63 +u-boot-with-spl.imx: SPL u-boot.uim FORCE
  64 + $(call if_changed,pad_cat)
  65 +
  66 +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE
  67 + $(call if_changed,pad_cat)
  68 +
  69 +quiet_cmd_u-boot-nand-spl_imx = GEN $@
  70 +cmd_u-boot-nand-spl_imx = (echo -ne '\x00\x00\x00\x00\x46\x43\x42\x20\x01' && \
  71 + dd bs=1015 count=1 if=/dev/zero 2>/dev/null) | cat - $< > $@
  72 +
  73 +spl/u-boot-nand-spl.imx: SPL FORCE
  74 + $(call if_changed,u-boot-nand-spl_imx)
  75 +
  76 +targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx)
... ... @@ -180,8 +180,8 @@
180 180 MLO MLO.byteswap: $(obj)/u-boot-spl.bin
181 181 $(call if_changed,mkimage)
182 182  
183   -$(objtree)/SPL: $(obj)/u-boot-spl.bin
184   - $(Q)$(MAKE) $(build)=spl/arch/arm/imx-common $@
  183 +SPL: $(obj)/u-boot-spl.bin
  184 + $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
185 185  
186 186 ALL-y += $(obj)/$(SPL_BIN).bin
187 187