Merge branch 'master' of /home/wd/git/u-boot/custodians
diff --git a/MAINTAINERS b/MAINTAINERS
index 57cd926..b37ed0c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1033,7 +1033,7 @@
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 5f93646..e17d821 100644
--- a/Makefile
+++ b/Makefile
@@ -416,6 +416,10 @@
$(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 7d1b495..83cb11c 100644
--- 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",
""
);
