* [U-Boot] [PATCH] kbuild: Rename UIMAGE to MKIMAGE
@ 2014-03-14 4:00 Marek Vasut
2014-03-14 4:34 ` Masahiro Yamada
2014-03-28 21:15 ` [U-Boot] " Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Marek Vasut @ 2014-03-14 4:00 UTC (permalink / raw)
To: u-boot
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>
---
Makefile | 2 +-
arch/arm/cpu/arm926ejs/mxs/Makefile | 2 +-
arch/arm/imx-common/Makefile | 2 +-
board/cray/L1/Makefile | 2 +-
board/matrix_vision/mvblm7/Makefile | 2 +-
board/matrix_vision/mvsmr/Makefile | 2 +-
spl/Makefile | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 538c3bf..e723218 100644
--- a/Makefile
+++ b/Makefile
@@ -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 1eee661..209c73c 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 16809fe..7334e05 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 655f530..5540298 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 b5987fd..9ed2837 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 fae7ec2..a9c794e 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 be5fd3b..9f5dbf4 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)
--
1.8.5.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] kbuild: Rename UIMAGE to MKIMAGE
2014-03-14 4:00 [U-Boot] [PATCH] kbuild: Rename UIMAGE to MKIMAGE Marek Vasut
@ 2014-03-14 4:34 ` Masahiro Yamada
2014-03-28 21:15 ` [U-Boot] " Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Masahiro Yamada @ 2014-03-14 4:34 UTC (permalink / raw)
To: u-boot
Hello Marek,
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] kbuild: Rename UIMAGE to MKIMAGE
2014-03-14 4:00 [U-Boot] [PATCH] kbuild: Rename UIMAGE to MKIMAGE Marek Vasut
2014-03-14 4:34 ` Masahiro Yamada
@ 2014-03-28 21:15 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2014-03-28 21:15 UTC (permalink / raw)
To: u-boot
On Fri, Mar 14, 2014 at 05:00:14AM +0100, Marek Vasut wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140328/6f4ede88/attachment.pgp>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-28 21:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-14 4:00 [U-Boot] [PATCH] kbuild: Rename UIMAGE to MKIMAGE Marek Vasut
2014-03-14 4:34 ` Masahiro Yamada
2014-03-28 21:15 ` [U-Boot] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox