diff options
| author | Marek Vasut <marex@denx.de> | 2014-03-14 05:00:14 +0100 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-28 15:06:29 -0400 |
| commit | b97241b3125a86b7fd77dc2357446d3346fef929 (patch) | |
| tree | 7db3d82eb7a7301f78d91e8cff5cea42f361f52a | |
| parent | 82b9547387389cc4147596cb45609bf29d3fdbdb (diff) | |
| download | talos-obmc-uboot-b97241b3125a86b7fd77dc2357446d3346fef929.tar.gz talos-obmc-uboot-b97241b3125a86b7fd77dc2357446d3346fef929.zip | |
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/imx-common/Makefile | 2 | ||||
| -rw-r--r-- | board/cray/L1/Makefile | 2 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/Makefile | 2 | ||||
| -rw-r--r-- | board/matrix_vision/mvsmr/Makefile | 2 | ||||
| -rw-r--r-- | spl/Makefile | 2 |
7 files changed, 7 insertions, 7 deletions
@@ -728,7 +728,7 @@ endif quiet_cmd_objcopy = OBJCOPY $@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ -quiet_cmd_mkimage = UIMAGE $@ +quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile index 1eee66111c..209c73cd2b 100644 --- a/arch/arm/cpu/arm926ejs/mxs/Makefile +++ b/arch/arm/cpu/arm926ejs/mxs/Makefile @@ -17,7 +17,7 @@ endif MKIMAGE_TARGET-$(CONFIG_MX23) = mxsimage.mx23.cfg MKIMAGE_TARGET-$(CONFIG_MX28) = mxsimage.mx28.cfg -quiet_cmd_mkimage_mxs = UIMAGE $@ +quiet_cmd_mkimage_mxs = MKIMAGE $@ cmd_mkimage_mxs = $(objtree)/tools/mkimage -n $< -T mxsimage $@ \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 16809fee5f..7334e05b5b 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -32,7 +32,7 @@ $(IMX_CONFIG): %.cfgtmp: % FORCE $(Q)mkdir -p $(dir $@) $(call if_changed_dep,cpp_cfg) -quiet_cmd_mkimage = UIMAGE $@ +quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) diff --git a/board/cray/L1/Makefile b/board/cray/L1/Makefile index 655f530f2e..55402981fd 100644 --- a/board/cray/L1/Makefile +++ b/board/cray/L1/Makefile @@ -15,7 +15,7 @@ quiet_cmd_awk = AWK $@ $(obj)/bootscript.c: $(obj)/bootscript.image $(src)/x2c.awk $(call cmd,awk) -quiet_cmd_mkimage = UIMAGE $@ +quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) diff --git a/board/matrix_vision/mvblm7/Makefile b/board/matrix_vision/mvblm7/Makefile index b5987fde39..9ed2837a78 100644 --- a/board/matrix_vision/mvblm7/Makefile +++ b/board/matrix_vision/mvblm7/Makefile @@ -8,7 +8,7 @@ obj-y := mvblm7.o pci.o fpga.o extra-y := bootscript.img -quiet_cmd_mkimage = UIMAGE $@ +quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) diff --git a/board/matrix_vision/mvsmr/Makefile b/board/matrix_vision/mvsmr/Makefile index fae7ec23b9..a9c794e21a 100644 --- a/board/matrix_vision/mvsmr/Makefile +++ b/board/matrix_vision/mvsmr/Makefile @@ -12,7 +12,7 @@ obj-y := mvsmr.o fpga.o extra-y := bootscript.img -quiet_cmd_mkimage = UIMAGE $@ +quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) diff --git a/spl/Makefile b/spl/Makefile index be5fd3b53a..9f5dbf4f3b 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -171,7 +171,7 @@ LDPPFLAGS += \ $(shell $(LD) --version | \ sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p') -quiet_cmd_mkimage = UIMAGE $@ +quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) |
