Merge branch 'master' into next

[oweals/u-boot.git] / cpu / leon2 / start.S

diff --git a/cpu/leon2/start.S b/cpu/leon2/start.S
index 9b5d83ea50f8978a59d140ca19b67c83465fd002..b1f1eb5f3ce28c6be6983375f880e61bf9eca0fe 100644 (file)
--- a/cpu/leon2/start.S
+++ b/cpu/leon2/start.S
@@ -27,6 +27,7 @@
 #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.  */
@@ -199,7 +200,7 @@ _trap_table:
        .globl  version_string
 version_string:
        .ascii U_BOOT_VERSION
-       .ascii " (", __DATE__, " - ", __TIME__, ")"
+       .ascii " (", U_BOOT_DATE, " - ", U_BOOT_TIME, ")"
        .ascii CONFIG_IDENT_STRING, "\0"
 
        .section        ".text"