]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
arm: rmobile: Change initializing ICCICR register
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Wed, 25 Jul 2012 06:48:27 +0000 (15:48 +0900)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 3 Oct 2012 00:04:24 +0000 (02:04 +0200)
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>
arch/arm/cpu/armv7/rmobile/lowlevel_init.S

index 8c3fc1134dda7181e4ec2b2d13388d72b14f9a32..1bd391e8403e7c8a7c4e17d3774752e896d06353 100644 (file)
@@ -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 */