summaryrefslogtreecommitdiffstats
path: root/arch/nios2
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 /arch/nios2
parent3857f8f5a5a029a2ff403f83e7b9987cfdb09569 (diff)
downloadtalos-obmc-uboot-09c2e90c110ef99f1203685acd1059114a51b167.tar.gz
talos-obmc-uboot-09c2e90c110ef99f1203685acd1059114a51b167.zip
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 'arch/nios2')
-rw-r--r--arch/nios2/cpu/start.S9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
index bf5d672498..0f4ab286b9 100644
--- a/arch/nios2/cpu/start.S
+++ b/arch/nios2/cpu/start.S
@@ -23,7 +23,6 @@
#include <asm-offsets.h>
#include <config.h>
-#include <timestamp.h>
#include <version.h>
/*************************************************************************
@@ -196,14 +195,8 @@ dly_clks:
bge r4, r0, dly_clks
ret
-
-#if !defined(CONFIG_IDENT_STRING)
-#define CONFIG_IDENT_STRING ""
-#endif
.data
.globl version_string
version_string:
- .ascii U_BOOT_VERSION
- .ascii " (", U_BOOT_DATE, " - ", U_BOOT_TIME, ")"
- .ascii CONFIG_IDENT_STRING, "\0"
+ .ascii U_BOOT_VERSION_STRING, "\0"
OpenPOWER on IntegriCloud