Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9bf215b0355bddc5792d31b6c41a8bd1bfa9e641

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent f9c235fd99
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 mkimage rules 

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

Showing 6 changed files with 34 additions and 29 deletions Side-by-side Diff

... ... @@ -746,6 +746,10 @@
746 746 quiet_cmd_objcopy = OBJCOPY $@
747 747 cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
748 748  
  749 +quiet_cmd_mkimage = UIMAGE $@
  750 +cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
  751 + $(if $(KBUILD_VERBOSE:1=), >/dev/null)
  752 +
749 753 all: $(ALL-y)
750 754  
751 755 PHONY += dtbs
752 756  
753 757  
754 758  
755 759  
... ... @@ -789,25 +793,22 @@
789 793 CONFIG_SYS_UBOOT_START := 0
790 794 endif
791 795  
792   -u-boot.img: u-boot.bin
793   - tools/mkimage -A $(ARCH) -T firmware -C none \
794   - -O u-boot -a $(CONFIG_SYS_TEXT_BASE) \
795   - -e $(CONFIG_SYS_UBOOT_START) \
796   - -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" \
797   - -d $< $@
  796 +MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \
  797 + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
  798 + -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board"
798 799  
799   -u-boot.imx: u-boot.bin
800   - $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
  800 +MKIMAGEFLAGS_u-boot.kwb = -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
  801 + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
801 802  
802   -u-boot.kwb: u-boot.bin
803   - tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
804   - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
  803 +MKIMAGEFLAGS_u-boot.pbl = -n $(CONFIG_SYS_FSL_PBL_RCW) \
  804 + -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage
805 805  
806   -u-boot.pbl: u-boot.bin
807   - tools/mkimage -n $(CONFIG_SYS_FSL_PBL_RCW) \
808   - -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage \
809   - -d $< $@
  806 +u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
  807 + $(call if_changed,mkimage)
810 808  
  809 +u-boot.imx: u-boot.bin
  810 + $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
  811 +
811 812 u-boot.sha1: u-boot.bin
812 813 tools/ubsha1 u-boot.bin
813 814  
... ... @@ -837,9 +838,10 @@
837 838 u-boot-with-spl.imx u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
838 839 $(Q)$(MAKE) $(build)=arch/arm/imx-common $(objtree)/$@
839 840  
840   -u-boot.ubl: u-boot-with-spl.bin
841   - tools/mkimage -n $(UBL_CONFIG) -T ublimage \
842   - -e $(CONFIG_SYS_TEXT_BASE) -d $< u-boot.ubl
  841 +MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE)
  842 +
  843 +u-boot.ubl: u-boot-with-spl.bin FORCE
  844 + $(call if_changed,mkimage)
843 845  
844 846 u-boot.ais: spl/u-boot-spl.bin u-boot.img
845 847 tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(srctree)/$(CONFIG_AIS_CONFIG_FILE:"%"=%),"/dev/null") \
arch/arm/cpu/armv7/am33xx/config.mk
Diff comments   View file @ 9bf215b
... ... @@ -4,8 +4,8 @@
4 4 # SPDX-License-Identifier: GPL-2.0+
5 5 #
6 6 ifdef CONFIG_SPL_BUILD
7   -ALL-y += $(OBJTREE)/MLO
8   -ALL-$(CONFIG_SPL_SPI_SUPPORT) += $(OBJTREE)/MLO.byteswap
  7 +ALL-y += MLO
  8 +ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap
9 9 else
10 10 ALL-y += u-boot.img
11 11 endif
arch/arm/cpu/armv7/omap3/config.mk
Diff comments   View file @ 9bf215b
... ... @@ -9,7 +9,7 @@
9 9 # SPDX-License-Identifier: GPL-2.0+
10 10 #
11 11 ifdef CONFIG_SPL_BUILD
12   -ALL-y += $(OBJTREE)/MLO
  12 +ALL-y += MLO
13 13 else
14 14 ALL-y += u-boot.img
15 15 endif
arch/arm/cpu/armv7/omap4/config.mk
Diff comments   View file @ 9bf215b
... ... @@ -9,7 +9,7 @@
9 9 # SPDX-License-Identifier: GPL-2.0+
10 10 #
11 11 ifdef CONFIG_SPL_BUILD
12   -ALL-y += $(OBJTREE)/MLO
  12 +ALL-y += MLO
13 13 else
14 14 ALL-y += u-boot.img
15 15 endif
arch/arm/cpu/armv7/omap5/config.mk
Diff comments   View file @ 9bf215b
... ... @@ -7,7 +7,7 @@
7 7 #
8 8  
9 9 ifdef CONFIG_SPL_BUILD
10   -ALL-y += $(OBJTREE)/MLO
  10 +ALL-y += MLO
11 11 else
12 12 ALL-y += u-boot.img
13 13 endif
... ... @@ -169,13 +169,16 @@
169 169 $(shell $(LD) --version | \
170 170 sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
171 171  
172   -$(OBJTREE)/MLO: $(obj)/u-boot-spl.bin
173   - $(OBJTREE)/tools/mkimage -T omapimage \
174   - -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
  172 +quiet_cmd_mkimage = UIMAGE $@
  173 +cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
  174 + $(if $(KBUILD_VERBOSE:1=), >/dev/null)
175 175  
176   -$(OBJTREE)/MLO.byteswap: $(obj)/u-boot-spl.bin
177   - $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
178   - -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
  176 +MKIMAGEFLAGS_MLO = -T omapimage -a $(CONFIG_SPL_TEXT_BASE)
  177 +
  178 +MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE)
  179 +
  180 +MLO MLO.byteswap: $(obj)/u-boot-spl.bin
  181 + $(call if_changed,mkimage)
179 182  
180 183 $(objtree)/SPL: $(obj)/u-boot-spl.bin
181 184 $(Q)$(MAKE) $(build)=spl/arch/arm/imx-common $@