Merge branch 'master' of git://git.denx.de/u-boot-ubi

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

diff --git a/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S
index 7b75660de1287b2e9f32fa0728e78e4eab3de3a0..8864c37cf65468467072b54e3375050de942be80 100644 (file)
--- a/cpu/mpc8xx/start.S
+++ b/cpu/mpc8xx/start.S
@@ -39,6 +39,7 @@
  */
 #include <config.h>
 #include <mpc8xx.h>
+#include <timestamp.h>
 #include <version.h>
 
 #define CONFIG_8xx 1           /* needed for Linux kernel header files */
@@ -87,7 +88,7 @@
        .globl  version_string
 version_string:
        .ascii U_BOOT_VERSION
-       .ascii " (", __DATE__, " - ", __TIME__, ")"
+       .ascii " (", U_BOOT_DATE, " - ", U_BOOT_TIME, ")"
        .ascii CONFIG_IDENT_STRING, "\0"
 
        . = EXC_OFF_SYS_RESET
@@ -141,7 +142,7 @@ boot_warm:
        lis     r3, IDC_DISABLE@h       /* Disable data cache */
        mtspr   DC_CST, r3
 
-#if !(defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || defined (CONFIG_FLAGADM))
+#if !defined(CONFIG_SYS_DELAYED_ICACHE)
                                        /* On IP860 and PCU E,
                                         * we cannot enable IC yet
                                         */