Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --git a/MAINTAINERS b/MAINTAINERS
index 57cd92685021cb5a268dc074f1066260d3601994..b37ed0ce9bf133c87b3d1c8ef922bf4a37c34a0e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1033,7 +1033,7 @@ Mark Jonas <mark.jonas@de.bosch.com>
 
        mpr2            SH7720
 
-Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 
        MS7720SE        SH7720
        R0P77850011RL   SH7785

diff --git a/Makefile b/Makefile
index 5f93646994ef863c68d72c0234c638172f3a0346..e17d821c7589d0728018e82f382d4107790673d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -416,6 +416,10 @@ $(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin
 $(VERSION_FILE):
                @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
                 '$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ) > $@.tmp
+               @( printf '#define CC_VERSION_STRING "%s"\n' \
+                '$(shell $(CC) --version | head -n 1)' )>>  $@.tmp
+               @( printf '#define LD_VERSION_STRING "%s"\n' \
+                '$(shell $(LD) -v | head -n 1)' )>>  $@.tmp
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
 $(TIMESTAMP_FILE):

diff --git a/common/cmd_version.c b/common/cmd_version.c
index 7d1b495c5124de56f351ed21ecd48c4605781a04..83cb11c6fda94c370d6a0a3080640ac9c37068b9 100644 (file)
--- a/common/cmd_version.c
+++ b/common/cmd_version.c
@@ -23,18 +23,25 @@
 
 #include <common.h>
 #include <command.h>
+#include <version.h>
 
 extern char version_string[];
 
 int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        printf("\n%s\n", version_string);
+#ifdef CC_VERSION_STRING
+       puts(CC_VERSION_STRING "\n");
+#endif
+#ifdef LD_VERSION_STRING
+       puts(LD_VERSION_STRING "\n");
+#endif
 
        return 0;
 }
 
 U_BOOT_CMD(
        version,        1,              1,      do_version,
-       "print monitor version",
+       "print monitor, compiler and linker version",
        ""
 );