Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[karo-tx-uboot.git] / common / cmd_version.c

diff --git a/common/cmd_version.c b/common/cmd_version.c
index 83cb11c6fda94c370d6a0a3080640ac9c37068b9..e8f40d3ed189b3308c66a61e40f46f6a465aab2a 100644 (file)
--- a/common/cmd_version.c
+++ b/common/cmd_version.c
@@ -24,10 +24,14 @@
 #include <common.h>
 #include <command.h>
 #include <version.h>
+#include <linux/compiler.h>
+#ifdef CONFIG_SYS_COREBOOT
+#include <asm/arch/sysinfo.h>
+#endif
 
-extern char version_string[];
+const char __weak version_string[] = U_BOOT_VERSION_STRING;
 
-int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        printf("\n%s\n", version_string);
 #ifdef CC_VERSION_STRING
@@ -36,7 +40,9 @@ int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef LD_VERSION_STRING
        puts(LD_VERSION_STRING "\n");
 #endif
-
+#ifdef CONFIG_SYS_COREBOOT
+       printf("coreboot-%s (%s)\n", lib_sysinfo.version, lib_sysinfo.build);
+#endif
        return 0;
 }