rockchip: rk3288: use ARM arch timer instead of rk_timer

[oweals/u-boot.git] / arch / arm / lib / vectors.S

diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
index 9cb0d2ef3618e99a23431fb472589c3678ce8ffe..56f36815582b9e3492828e511e41fb951f33af72 100644 (file)
--- a/arch/arm/lib/vectors.S
+++ b/arch/arm/lib/vectors.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  vectors - Generic ARM exception table code
  *
@@ -9,8 +10,6 @@
  *  Copyright (c) 2002 Alex Züpke <azu@sysgo.de>
  *  Copyright (c) 2002 Gary Jennejohn <garyj@denx.de>
  *  Copyright (c) 2002 Kyle Harris <kharris@nexus-tech.net>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -20,7 +19,11 @@
  * for the non-boot0 case or by a boot0-header.
  */
         .macro ARM_VECTORS
+#ifdef CONFIG_ARCH_K3
+       ldr     pc, _reset
+#else
        b       reset
+#endif
        ldr     pc, _undefined_instruction
        ldr     pc, _software_interrupt
        ldr     pc, _prefetch_abort
@@ -65,7 +68,6 @@
  *   (2) inserts the vector table using ARM_VECTORS as appropriate
  */
 #include <asm/arch/boot0.h>
-
 #else
 
 /*
@@ -95,6 +97,7 @@ _start:
  *************************************************************************
  */
 
+       .globl  _reset
        .globl  _undefined_instruction
        .globl  _software_interrupt
        .globl  _prefetch_abort
@@ -103,6 +106,9 @@ _start:
        .globl  _irq
        .globl  _fiq
 
+#ifdef CONFIG_ARCH_K3
+_reset:                        .word reset
+#endif
 _undefined_instruction:        .word undefined_instruction
 _software_interrupt:   .word software_interrupt
 _prefetch_abort:       .word prefetch_abort
@@ -134,7 +140,7 @@ not_used:
 irq:
 fiq:
 1:
-       bl      1b                      /* hang and never return */
+       b       1b                      /* hang and never return */
 
 #else  /* !CONFIG_SPL_BUILD */