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

[oweals/u-boot.git] / arch / mips / lib / cache_init.S

diff --git a/arch/mips/lib/cache_init.S b/arch/mips/lib/cache_init.S
index 5616ee6dfd6efb5d3b70ba103a72a411e63c510a..cfad1d9c8a97050b001846efdd971601089b3663 100644 (file)
--- a/arch/mips/lib/cache_init.S
+++ b/arch/mips/lib/cache_init.S
@@ -14,10 +14,6 @@
 #include <asm/cacheops.h>
 #include <asm/cm.h>
 
-#ifndef CONFIG_SYS_MIPS_CACHE_MODE
-#define CONFIG_SYS_MIPS_CACHE_MODE CONF_CM_CACHABLE_NONCOHERENT
-#endif
-
        .macro  f_fill64 dst, offset, val
        LONG_S  \val, (\offset +  0 * LONGSIZE)(\dst)
        LONG_S  \val, (\offset +  1 * LONGSIZE)(\dst)
@@ -331,7 +327,7 @@ l1_init:
        and             t0, t0, t1
        PTR_LI          t1, CKSEG1
        or              t0, t0, t1
-       li              a0, CONFIG_SYS_MIPS_CACHE_MODE
+       li              a0, CONF_CM_CACHABLE_NONCOHERENT
        jalr.hb         t0
 
        /*