summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Holler <holler@ahsoftware.de>2011-01-19 00:24:40 +0100
committerWolfgang Denk <wd@denx.de>2011-02-02 21:56:39 +0100
commit89ffa8dbb5bd0552f5f3399f4430a4c97f4d50d4 (patch)
tree0103652e012b5fd2ccf8fbe6e134776970bf16f7
parentc9cb009560af68349b3c492a9ca88776e442c2ce (diff)
Print compiler and linker version with the version command
After years of unsuccessful research I've finally shamelessly stolen other peoples intellectual properties to present the all-new and world-changing updated version command: - U-Boot>> version U-Boot 2010.12-00014-g7435056-dirty (Jan 18 2011 - 23:19:38) MyBoard gcc (GCC) 0.42 (Distro foobar) GNU ld (GNU Binutils) 0.314159265 - May the toolchain bugs rest in peace. Signed-off-by: Alexander Holler <holler@ahsoftware.de>
-rw-r--r--Makefile4
-rw-r--r--common/cmd_version.c9
2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5f93646994..e17d821c75 100644
--- 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 7d1b495c51..83cb11c6fd 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",
""
);