Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'

[u-boot] / arch / m68k / cpu / mcf532x / start.S

diff --git a/arch/m68k/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S
index a80b0a99464bdd4847a1ac076e4f9e5dcd7ef1a0..fe98d76474af37aefb37c3a7bcab499e7db0faf4 100644 (file)
--- a/arch/m68k/cpu/mcf532x/start.S
+++ b/arch/m68k/cpu/mcf532x/start.S
@@ -24,8 +24,8 @@
  * MA 02111-1307 USA
  */
 
+#include <asm-offsets.h>
 #include <config.h>
-#include <timestamp.h>
 #include "version.h"
 #include <asm/cache.h>
 
@@ -282,7 +282,5 @@ _int_handler:
 /*------------------------------------------------------------------------------*/
        .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 4