summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Spence <nick.spence@freescale.com>2008-08-28 14:09:11 -0700
committerKim Phillips <kim.phillips@freescale.com>2008-09-03 16:06:51 -0500
commitade50c7fa1b16ef98be17e9c3ae286aecf4f5605 (patch)
tree4b9533cbea8331453998f3d421015cf717755d35
parentd9fe88173cb4f7d293796ffe10c7a0d3d426d8f9 (diff)
downloadu-boot-imx-ade50c7fa1b16ef98be17e9c3ae286aecf4f5605.zip
u-boot-imx-ade50c7fa1b16ef98be17e9c3ae286aecf4f5605.tar.gz
u-boot-imx-ade50c7fa1b16ef98be17e9c3ae286aecf4f5605.tar.bz2
mpc83xx: use r4 instead of r2 in lock_ram_in_cache and unlock_ram_in_cache
This is needed in unlock_ram_in_cache() because it is called from C and will corrupt the small data area anchor that is kept in R2. lock_ram_in_cache() is modified similarly as good coding practice, but is not called from C. Signed-off-by: Nick Spence <nick.spence@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
-rw-r--r--cpu/mpc83xx/start.S9
1 files changed, 5 insertions, 4 deletions
diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S
index 16ed494..75ad36c 100644
--- a/cpu/mpc83xx/start.S
+++ b/cpu/mpc83xx/start.S
@@ -1060,9 +1060,9 @@ lock_ram_in_cache:
*/
lis r3, (CFG_INIT_RAM_ADDR & ~31)@h
ori r3, r3, (CFG_INIT_RAM_ADDR & ~31)@l
- li r2, ((CFG_INIT_RAM_END & ~31) + \
+ li r4, ((CFG_INIT_RAM_END & ~31) + \
(CFG_INIT_RAM_ADDR & 31) + 31) / 32
- mtctr r2
+ mtctr r4
1:
dcbz r0, r3
addi r3, r3, 32
@@ -1082,8 +1082,9 @@ unlock_ram_in_cache:
/* invalidate the INIT_RAM section */
lis r3, (CFG_INIT_RAM_ADDR & ~31)@h
ori r3, r3, (CFG_INIT_RAM_ADDR & ~31)@l
- li r2,512
- mtctr r2
+ li r4, ((CFG_INIT_RAM_END & ~31) + \
+ (CFG_INIT_RAM_ADDR & 31) + 31) / 32
+ mtctr r4
1: icbi r0, r3
dcbi r0, r3
addi r3, r3, 32