projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'u-boot-imx/master'
[oweals/u-boot.git]
/
arch
/
mips
/
cpu
/
mips32
/
start.S
diff --git
a/arch/mips/cpu/mips32/start.S
b/arch/mips/cpu/mips32/start.S
index e829b024c728fa4d4d3be7a973967b0ace846929..9c1b2f76d09bcff61c4d617da0795b7f35b9085c 100644
(file)
--- a/
arch/mips/cpu/mips32/start.S
+++ b/
arch/mips/cpu/mips32/start.S
@@
-27,6
+27,10
@@
#include <asm/regdef.h>
#include <asm/mipsregs.h>
#include <asm/regdef.h>
#include <asm/mipsregs.h>
+#ifndef CONFIG_SYS_MIPS_CACHE_MODE
+#define CONFIG_SYS_MIPS_CACHE_MODE CONF_CM_CACHABLE_NONCOHERENT
+#endif
+
/*
* For the moment disable interrupts, mark the kernel mode and
* set ST0_KX so that the CPU does not spit fire when using
/*
* For the moment disable interrupts, mark the kernel mode and
* set ST0_KX so that the CPU does not spit fire when using
@@
-249,7
+253,7
@@
reset:
nop
/* ... and enable them */
nop
/* ... and enable them */
- li t0, CONF
_CM_CACHABLE_NONCOHERENT
+ li t0, CONF
IG_SYS_MIPS_CACHE_MODE
mtc0 t0, CP0_CONFIG
#endif
mtc0 t0, CP0_CONFIG
#endif