Patchwork [U-Boot] arm: rmobile: Change initializing ICCICR register

login
register
mail settings
Submitter Nobuhiro Iwamatsu
Date Aug. 3, 2012, 8:07 a.m.
Message ID <1343981263-19341-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com>
Download mbox | patch
Permalink /patch/174928/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Nobuhiro Iwamatsu - Aug. 3, 2012, 8:07 a.m.
There is rmobile without ICCICR.
ICCICR is initialized only when ICCICR is defined.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
 arch/arm/cpu/armv7/rmobile/lowlevel_init.S |    3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
index 30bbef0..c04ce93 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 */