aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/cmd_version.c9
-rw-r--r--common/hwconfig.c4
2 files changed, 10 insertions, 3 deletions
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",
""
);
diff --git a/common/hwconfig.c b/common/hwconfig.c
index 515074808d..e47d4d7420 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -81,8 +81,8 @@ static const char *__hwconfig(const char *opt, size_t *arglen,
if (!env_hwconfig) {
if (!(gd->flags & GD_FLG_ENV_READY)) {
printf("WARNING: Calling __hwconfig without a buffer "
- "and before environment is ready\n");
- return NULL;
+ "and before environment is ready\n");
+ return NULL;
}
env_hwconfig = getenv("hwconfig");
}