Correct shift offsets in icache_status and dcache_status for MPC83xx.

diff --git a/CHANGELOG b/CHANGELOG
index 77f1a254d2c894149e585d19568c5a3208a5e812..e40ba053e910e1f30e3c773e1415fcc9cf916f20 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Correct shift offsets in icache_status and dcache_status for MPC83xx.
+
 * Add support for DS1374 RTC chip.
 
 * Apply SoC concept to arm926ejs CPUs, i.e. move the SoC specific

diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S
index 46c748f7905a3c73d611cc2817fc2137fd6cc891..324f6c36fe6bb870afd644a7b6c12eb649cf2092 100644 (file)
--- a/cpu/mpc83xx/start.S
+++ b/cpu/mpc83xx/start.S
@@ -796,7 +796,7 @@ icache_disable:
        .globl  icache_status
 icache_status:
        mfspr   r3, HID0
-       rlwinm  r3, r3, HID0_ICE_SHIFT, 31, 31
+       rlwinm  r3, r3, (31 - HID0_ICE_SHIFT + 1), 31, 31
        blr
 
        .globl  dcache_enable
@@ -828,7 +828,7 @@ dcache_disable:
        .globl  dcache_status
 dcache_status:
        mfspr   r3, HID0
-       rlwinm  r3, r3, HID0_DCE_SHIFT, 31, 31
+       rlwinm  r3, r3, (31 - HID0_DCE_SHIFT + 1), 31, 31
        blr
 
        .globl get_pvr