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/powerpc/cpu/mpc83xx | |
| parent | 3857f8f5a5a029a2ff403f83e7b9987cfdb09569 (diff) | |
| download | u-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 'arch/powerpc/cpu/mpc83xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/start.S | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 7e60315..b70b4ca 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -30,7 +30,9 @@ #include <asm-offsets.h> #include <config.h> #include <mpc83xx.h> -#include <timestamp.h> +#ifndef CONFIG_IDENT_STRING +#define CONFIG_IDENT_STRING "MPC83XX" +#endif #include <version.h> #define CONFIG_83XX 1 /* needed for Linux kernel header files*/ @@ -43,10 +45,6 @@ #include <asm/mmu.h> #include <asm/u-boot.h> -#ifndef CONFIG_IDENT_STRING -#define CONFIG_IDENT_STRING "MPC83XX" -#endif - /* We don't want the MMU yet. */ #undef MSR_KERNEL @@ -107,9 +105,7 @@ .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" .align 2 |