Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / arch / arm / cpu / armv7 / rmobile / lowlevel_init.S

diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
index 2cd410b70fcb825bf167616d279a41978ced6a35..0d654403eef53ea36821c10a97fe7f4e042bfb54 100644 (file)
--- a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
@@ -2,23 +2,7 @@
  * Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.Iwamatsu.yj@renesas.com>
  * Copyright (C) 2012 Renesas Solutions Corp.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -38,6 +22,7 @@ ENTRY(lowlevel_init)
        .align 4
 
 wait_interrupt:
+#ifdef ICCICR
        ldr     r1, =ICCICR
        mov     r2, #0x0
        str     r2, [r1]
@@ -47,9 +32,10 @@ wait_interrupt:
        ldr     r1, =ICCICR
        mov     r2, #0x1
        str     r2, [r1]
+#endif
 
 wait_loop:
-       wfi
+       .long   0xE320F003 /* wfi */
 
        ldr             r2, [r1, #0xC]
        str             r2, [r1, #0x10]
@@ -74,16 +60,7 @@ loop0:
        bne  loop0
 
        ldr sp, MERAM_STACK
-
-       str ip, [sp]    /* stash old link register */
-       mov ip, lr      /* save link reg across call */
-       bl  s_init
-
-       ldr ip, [sp]    /* restore save ip */
-       mov lr, ip      /* restore link reg */
-
-       /* back to arch calling code */
-       mov pc, lr
+       b s_init
 
        .pool
        .align 4