summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/mx5/lowlevel_init.S
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-11-07 09:32:16 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-11-07 09:32:16 +0100
commit3285d4ca197928a048d3dda86751b5d26e6e0e86 (patch)
treec1ab908fb4fac09839c672c765b98a0512d1e9d1 /arch/arm/cpu/armv7/mx5/lowlevel_init.S
parentc0e5dd88c438a41bf180dde0c2dc4c67dcd8058d (diff)
parentc93addb5635630847e8a33f6dba4afef78a6d180 (diff)
downloadu-boot-imx-3285d4ca197928a048d3dda86751b5d26e6e0e86.zip
u-boot-imx-3285d4ca197928a048d3dda86751b5d26e6e0e86.tar.gz
u-boot-imx-3285d4ca197928a048d3dda86751b5d26e6e0e86.tar.bz2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/mx5/lowlevel_init.S')
-rw-r--r--arch/arm/cpu/armv7/mx5/lowlevel_init.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S
index 25fadf6..f5bc672 100644
--- a/arch/arm/cpu/armv7/mx5/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/mx5/lowlevel_init.S
@@ -45,6 +45,12 @@
#endif
mcr 15, 1, r0, c9, c0, 2
+
+ /* enable L2 cache */
+ mrc 15, 0, r0, c1, c0, 1
+ orr r0, r0, #2
+ mcr 15, 0, r0, c1, c0, 1
+
.endm /* init_l2cc */
/* AIPS setup - Only setup MPROTx registers.
@@ -369,12 +375,6 @@ setup_pll_func:
#endif /* CONFIG_MX53 */
.endm
-.macro setup_wdog
- ldr r0, =WDOG1_BASE_ADDR
- mov r1, #0x30
- strh r1, [r0]
-.endm
-
ENTRY(lowlevel_init)
mov r10, lr
mov r4, #0 /* Fix R4 to 0 */