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 branch 'master' of git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
cpu
/
ppc4xx
/
cache.S
diff --git
a/cpu/ppc4xx/cache.S
b/cpu/ppc4xx/cache.S
index 5124dec77f4c2af89e0aea9eb390ece9beaa3ef7..269716fcebf34c0d450873620b8a92eaf87e01b0 100644
(file)
--- a/
cpu/ppc4xx/cache.S
+++ b/
cpu/ppc4xx/cache.S
@@
-143,8
+143,8
@@
_GLOBAL(flush_dcache)
_GLOBAL(invalidate_dcache)
addi r6,0,0x0000 /* clear GPR 6 */
/* Do loop for # of dcache congruence classes. */
_GLOBAL(invalidate_dcache)
addi r6,0,0x0000 /* clear GPR 6 */
/* Do loop for # of dcache congruence classes. */
- lis r7,(C
FG_DCACHE_SIZE / L1_CACHE_BYTES / 2)@ha
/* TBS for large sized cache */
- ori r7,r7,(C
FG
_DCACHE_SIZE / L1_CACHE_BYTES / 2)@l
+ lis r7,(C
ONFIG_SYS_DCACHE_SIZE / L1_CACHE_BYTES / 2)@ha
/* TBS for large sized cache */
+ ori r7,r7,(C
ONFIG_SYS
_DCACHE_SIZE / L1_CACHE_BYTES / 2)@l
/* NOTE: dccci invalidates both */
mtctr r7 /* ways in the D cache */
..dcloop:
/* NOTE: dccci invalidates both */
mtctr r7 /* ways in the D cache */
..dcloop:
@@
-166,9
+166,11
@@
_GLOBAL(invalidate_dcache)
#ifdef CONFIG_440
.globl dcache_disable
#ifdef CONFIG_440
.globl dcache_disable
+ .globl dcache_enable
.globl icache_disable
.globl icache_enable
dcache_disable:
.globl icache_disable
.globl icache_enable
dcache_disable:
+dcache_enable:
icache_disable:
icache_enable:
blr
icache_disable:
icache_enable:
blr