toradex: common: Remove stale comments about modules availability

[J-u-boot.git] / cmd / version.c

diff --git a/cmd/version.c b/cmd/version.c
index 1be0667f0938982158b34aedc3fb6c22c444db91..f83f6aff92ca6c1df5c04ea8c8263c0ef628e46f 100644 (file)
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -1,23 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, [email protected].
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <timestamp.h>
 #include <version.h>
+#include <version_string.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_SYS_COREBOOT
-#include <asm/arch/sysinfo.h>
+#include <asm/cb_sysinfo.h>
 #endif
 
-const char __weak version_string[] = U_BOOT_VERSION_STRING;
+#define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
+       U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING
 
-static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+const char version_string[] = U_BOOT_VERSION_STRING;
+
+static int do_version(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
-       printf("\n%s\n", version_string);
+       char buf[DISPLAY_OPTIONS_BANNER_LENGTH];
+
+       printf(display_options_get_banner(false, buf, sizeof(buf)));
 #ifdef CC_VERSION_STRING
        puts(CC_VERSION_STRING "\n");
 #endif