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

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

diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
index c4895369bfb0c853f2cea935113cd80e0e9e4269..746df922c27d686a6376cf03b238158ba0daeff4 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@ -7,23 +7,7 @@
  * Author :
  *     Aneesh V        <aneesh@ti.com>
  *
- * 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>
@@ -32,17 +16,23 @@
 #include <asm/arch/spl.h>
 #include <linux/linkage.h>
 
+#ifndef CONFIG_OMAP34XX
 ENTRY(save_boot_params)
        ldr     r1, =OMAP_SRAM_SCRATCH_BOOT_PARAMS
        str     r0, [r1]
-       bx      lr
+       b       save_boot_params_ret
 ENDPROC(save_boot_params)
+#endif
 
-ENTRY(set_pl310_ctrl_reg)
-       PUSH    {r4-r11, lr}    @ save registers - ROM code may pollute
+ENTRY(omap_smc1)
+       PUSH    {r4-r12, lr}    @ save registers - ROM code may pollute
                                @ our registers
-       LDR     r12, =0x102     @ Set PL310 control register - value in R0
-       .word   0xe1600070      @ SMC #0 - hand assembled because -march=armv5
-                               @ call ROM Code API to set control register
-       POP     {r4-r11, pc}
-ENDPROC(set_pl310_ctrl_reg)
+       MOV     r12, r0         @ Service
+       MOV     r0, r1          @ Argument
+       DSB
+       DMB
+       .word   0xe1600070      @ SMC #0 - hand assembled for GCC versions
+                               @ call ROM Code API for the service requested
+
+       POP     {r4-r12, pc}
+ENDPROC(omap_smc1)