summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/pxa
diff options
context:
space:
mode:
authorMike Dunn <mikedunn@newsguy.com>2013-06-17 10:47:28 -0700
committerMarek Vasut <marex@denx.de>2013-06-22 15:25:28 +0200
commit097d86d098ce9c5c59501b4bffd2a3d3324166ef (patch)
tree250fb2c64c27a67d978a3e6ad63c941b67f4b7be /arch/arm/cpu/pxa
parent3497d43215b6919e680fefe59b38b71516adf2a0 (diff)
downloadtalos-obmc-uboot-097d86d098ce9c5c59501b4bffd2a3d3324166ef.tar.gz
talos-obmc-uboot-097d86d098ce9c5c59501b4bffd2a3d3324166ef.zip
pxa: turn icache off in cpu_init_crit()
The comment in the low-level initialization function cpu_init_crit() says that the caches are being disabled, but (oddly) the icache is actually turned on. This is probably not a good idea prior to relocating code, so this patch turns it off. Tested on the pxa270. Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
Diffstat (limited to 'arch/arm/cpu/pxa')
-rw-r--r--arch/arm/cpu/pxa/start.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 2e3f65ee84..2e623b1083 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -208,10 +208,9 @@ cpu_init_crit:
* disable MMU stuff and caches
*/
mrc p15, 0, r0, c1, c0, 0
- bic r0, r0, #0x00002300 @ clear bits 13, 9:8 (--V- --RS)
+ bic r0, r0, #0x00003300 @ clear bits 13:12, 9:8 (--VI --RS)
bic r0, r0, #0x00000087 @ clear bits 7, 2:0 (B--- -CAM)
orr r0, r0, #0x00000002 @ set bit 2 (A) Align
- orr r0, r0, #0x00001000 @ set bit 12 (I) I-Cache
mcr p15, 0, r0, c1, c0, 0
mov pc, lr /* back to my caller */
OpenPOWER on IntegriCloud