diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-12 10:37:11 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-12 22:58:33 +0200 |
| commit | 976b38c0742dc1db13af03cae9ded4392e47182d (patch) | |
| tree | 5c61700ed8b85997084784c3a66a0d7e19815a21 | |
| parent | 04c2dd827b5887561b182653e47545d19b934c46 (diff) | |
| download | u-boot-imx-976b38c0742dc1db13af03cae9ded4392e47182d.zip u-boot-imx-976b38c0742dc1db13af03cae9ded4392e47182d.tar.gz u-boot-imx-976b38c0742dc1db13af03cae9ded4392e47182d.tar.bz2 | |
mkimage: add "-V" option to print version information
Signed-off-by: Wolfgang Denk <wd@denx.de>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | tools/mkimage.c | 6 |
2 files changed, 12 insertions, 2 deletions
@@ -413,8 +413,12 @@ $(obj)u-boot-onenand.bin: onenand_ipl $(obj)u-boot.bin cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin $(VERSION_FILE): - @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \ - '$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ) > $@.tmp + @( localvers='$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ; \ + printf '#define PLAIN_VERSION "%s%s"\n' \ + "$(U_BOOT_VERSION)" "$${localvers}" ; \ + printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' \ + "$(U_BOOT_VERSION)" "$${localvers}" ; \ + ) > $@.tmp @( printf '#define CC_VERSION_STRING "%s"\n' \ '$(shell $(CC) --version | head -n 1)' )>> $@.tmp @( printf '#define LD_VERSION_STRING "%s"\n' \ diff --git a/tools/mkimage.c b/tools/mkimage.c index f5859d7..60f7263 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -23,6 +23,7 @@ #include "mkimage.h" #include <image.h> +#include <version.h> static void copy_file(int, const char *, int); static void usage(void); @@ -246,6 +247,9 @@ main (int argc, char **argv) case 'v': params.vflag++; break; + case 'V': + printf("mkimage version %s\n", PLAIN_VERSION); + exit(EXIT_SUCCESS); case 'x': params.xflag++; break; @@ -590,6 +594,8 @@ usage () params.cmdname); fprintf (stderr, " %s [-D dtc_options] -f fit-image.its fit-image\n", params.cmdname); + fprintf (stderr, " %s -V ==> print version information and exit\n", + params.cmdname); exit (EXIT_FAILURE); } |