summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2011-07-18 20:24:04 +0200
committerWolfgang Denk <wd@denx.de>2011-07-28 17:22:53 +0200
commit09c2e90c110ef99f1203685acd1059114a51b167 (patch)
tree78e6601f6b9a8171cf0981d7a5acd9e7259c91ef /common
parent3857f8f5a5a029a2ff403f83e7b9987cfdb09569 (diff)
downloadu-boot-imx-09c2e90c110ef99f1203685acd1059114a51b167.zip
u-boot-imx-09c2e90c110ef99f1203685acd1059114a51b167.tar.gz
u-boot-imx-09c2e90c110ef99f1203685acd1059114a51b167.tar.bz2
unify version_string
This patch removes the architecture specific implementation of version_string where possible. Some architectures use a special place and therefore we provide U_BOOT_VERSION_STRING definition and a common weak symbol version_string. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> CC: Mike Frysinger <vapier@gentoo.org> CC: Peter Pan <pppeterpppan@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_version.c3
-rw-r--r--common/main.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_version.c b/common/cmd_version.c
index 83cb11c..e4b2ac1 100644
--- a/common/cmd_version.c
+++ b/common/cmd_version.c
@@ -24,8 +24,9 @@
#include <common.h>
#include <command.h>
#include <version.h>
+#include <linux/compiler.h>
-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[])
{
diff --git a/common/main.c b/common/main.c
index 1f22142..3324d9d 100644
--- a/common/main.c
+++ b/common/main.c
@@ -30,6 +30,7 @@
#include <common.h>
#include <watchdog.h>
#include <command.h>
+#include <version.h>
#ifdef CONFIG_MODEM_SUPPORT
#include <malloc.h> /* for free() prototype */
#endif
@@ -307,8 +308,6 @@ void main_loop (void)
#ifdef CONFIG_VERSION_VARIABLE
{
- extern char version_string[];
-
setenv ("ver", version_string); /* set version variable */
}
#endif /* CONFIG_VERSION_VARIABLE */