summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/rmobile
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>2012-07-25 15:48:27 +0900
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-10-03 02:04:24 +0200
commit2f7ea5b047edcf45090ddcbd51e87f6b014e7732 (patch)
tree50347466220a827ab70667b720fcaf9db5c189b3 /arch/arm/cpu/armv7/rmobile
parentaf0dd19c2e864bb799e55e42133ebdfc631543c3 (diff)
downloadblackbird-obmc-uboot-2f7ea5b047edcf45090ddcbd51e87f6b014e7732.tar.gz
blackbird-obmc-uboot-2f7ea5b047edcf45090ddcbd51e87f6b014e7732.zip
arm: rmobile: Change initializing ICCICR register
There is rmobile without ICCICR. ICCICR is initialized only when ICCICR is defined. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'arch/arm/cpu/armv7/rmobile')
-rw-r--r--arch/arm/cpu/armv7/rmobile/lowlevel_init.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
index 8c3fc1134d..1bd391e840 100644
--- a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
@@ -38,6 +38,7 @@ ENTRY(lowlevel_init)
.align 4
wait_interrupt:
+#ifdef ICCICR
ldr r1, =ICCICR
mov r2, #0x0
str r2, [r1]
@@ -47,6 +48,7 @@ wait_interrupt:
ldr r1, =ICCICR
mov r2, #0x1
str r2, [r1]
+#endif
wait_loop:
.long 0xE320F003 /* wfi */
@@ -77,6 +79,7 @@ loop0:
str ip, [sp] /* stash old link register */
mov ip, lr /* save link reg across call */
+
bl s_init
ldr ip, [sp] /* restore save ip */
OpenPOWER on IntegriCloud