Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b97241b3125a86b7fd77dc2357446d3346fef929

Authored by Marek Vasut
Committed by Tom Rini
1 parent 82b9547387
Exists in v2017.01-smarct4x and in 48 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

kbuild: Rename UIMAGE to MKIMAGE 

U-Boot uses the 'mkimage' tool to produce various image types,
not only uImage image type. Rename the invocation name from
UIMAGE to MKIMAGE.

The following command was used to do the replacement:
git grep 'quiet_cmd_mkimage.* = UIMAGE' | cut -d : -f 1 | \
 xargs -i sed -i "s@\(quiet_cmd_mkimage\)\(.*\) = UIMAGE @\1\2 = MKIMAGE@" {}

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 7 changed files with 7 additions and 7 deletions Side-by-side Diff

... ... @@ -728,7 +728,7 @@
728 728 quiet_cmd_objcopy = OBJCOPY $@
729 729 cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
730 730  
731   -quiet_cmd_mkimage = UIMAGE $@
  731 +quiet_cmd_mkimage = MKIMAGE $@
732 732 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
733 733 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
734 734  
arch/arm/cpu/arm926ejs/mxs/Makefile
Diff comments   View file @ b97241b
... ... @@ -17,7 +17,7 @@
17 17 MKIMAGE_TARGET-$(CONFIG_MX23) = mxsimage.mx23.cfg
18 18 MKIMAGE_TARGET-$(CONFIG_MX28) = mxsimage.mx28.cfg
19 19  
20   -quiet_cmd_mkimage_mxs = UIMAGE $@
  20 +quiet_cmd_mkimage_mxs = MKIMAGE $@
21 21 cmd_mkimage_mxs = $(objtree)/tools/mkimage -n $< -T mxsimage $@ \
22 22 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
23 23  
arch/arm/imx-common/Makefile
Diff comments   View file @ b97241b
... ... @@ -32,7 +32,7 @@
32 32 $(Q)mkdir -p $(dir $@)
33 33 $(call if_changed_dep,cpp_cfg)
34 34  
35   -quiet_cmd_mkimage = UIMAGE $@
  35 +quiet_cmd_mkimage = MKIMAGE $@
36 36 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
37 37 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
38 38  
board/cray/L1/Makefile
Diff comments   View file @ b97241b
... ... @@ -15,7 +15,7 @@
15 15 $(obj)/bootscript.c: $(obj)/bootscript.image $(src)/x2c.awk
16 16 $(call cmd,awk)
17 17  
18   -quiet_cmd_mkimage = UIMAGE $@
  18 +quiet_cmd_mkimage = MKIMAGE $@
19 19 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
20 20 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
21 21  
board/matrix_vision/mvblm7/Makefile
Diff comments   View file @ b97241b
... ... @@ -8,7 +8,7 @@
8 8  
9 9 extra-y := bootscript.img
10 10  
11   -quiet_cmd_mkimage = UIMAGE $@
  11 +quiet_cmd_mkimage = MKIMAGE $@
12 12 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
13 13 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
14 14  
board/matrix_vision/mvsmr/Makefile
Diff comments   View file @ b97241b
... ... @@ -12,7 +12,7 @@
12 12  
13 13 extra-y := bootscript.img
14 14  
15   -quiet_cmd_mkimage = UIMAGE $@
  15 +quiet_cmd_mkimage = MKIMAGE $@
16 16 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
17 17 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
18 18  
... ... @@ -171,7 +171,7 @@
171 171 $(shell $(LD) --version | \
172 172 sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
173 173  
174   -quiet_cmd_mkimage = UIMAGE $@
  174 +quiet_cmd_mkimage = MKIMAGE $@
175 175 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
176 176 $(if $(KBUILD_VERBOSE:1=), >/dev/null)
177 177