diff options
| author | Andreas Bießmann <andreas.devel@googlemail.com> | 2011-07-18 20:24:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-28 17:22:53 +0200 |
| commit | 09c2e90c110ef99f1203685acd1059114a51b167 (patch) | |
| tree | 78e6601f6b9a8171cf0981d7a5acd9e7259c91ef /arch/sparc | |
| parent | 3857f8f5a5a029a2ff403f83e7b9987cfdb09569 (diff) | |
| download | talos-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/sparc')
| -rw-r--r-- | arch/sparc/cpu/leon2/start.S | 5 | ||||
| -rw-r--r-- | arch/sparc/cpu/leon3/start.S | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/sparc/cpu/leon2/start.S b/arch/sparc/cpu/leon2/start.S index f22fb7eb1b..9cd6c667d3 100644 --- a/arch/sparc/cpu/leon2/start.S +++ b/arch/sparc/cpu/leon2/start.S @@ -28,7 +28,6 @@ #include <asm/psr.h> #include <asm/stack.h> #include <asm/leon.h> -#include <timestamp.h> #include <version.h> /* Entry for traps which jump to a programmer-specified trap handler. */ @@ -200,9 +199,7 @@ _trap_table: .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" .section ".text" .align 4 diff --git a/arch/sparc/cpu/leon3/start.S b/arch/sparc/cpu/leon3/start.S index 56ae88d649..1e393a56e6 100644 --- a/arch/sparc/cpu/leon3/start.S +++ b/arch/sparc/cpu/leon3/start.S @@ -28,7 +28,6 @@ #include <asm/psr.h> #include <asm/stack.h> #include <asm/leon.h> -#include <timestamp.h> #include <version.h> /* Entry for traps which jump to a programmer-specified trap handler. */ @@ -201,9 +200,7 @@ _trap_table: .extern leon3_snooping_avail .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" .section ".text" .align 4 |
