From 2f7ea5b047edcf45090ddcbd51e87f6b014e7732 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 25 Jul 2012 15:48:27 +0900 Subject: [PATCH] arm: rmobile: Change initializing ICCICR register There is rmobile without ICCICR. ICCICR is initialized only when ICCICR is defined. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- arch/arm/cpu/armv7/rmobile/lowlevel_init.S | 3 +++ 1 file changed, 3 insertions(+) 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 */ -- 2.39.5