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

[u-boot] / cpu / arm1136 / start.S

diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S
index 8b765f1e806d0c5418214c924c9930941cb9bed6..51b664d9355e0803c9518d9b5a6656e28878d603 100644 (file)
--- a/cpu/arm1136/start.S
+++ b/cpu/arm1136/start.S
@@ -30,9 +30,6 @@
 
 #include <config.h>
 #include <version.h>
-#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
-#include <asm/arch/omap2420.h>
-#endif
 .globl _start
 _start: b      reset
 #ifdef CONFIG_ONENAND_IPL
@@ -134,7 +131,7 @@ reset:
 #ifdef CONFIG_OMAP2420H4
        /* Copy vectors to mask ROM indirect addr */
        adr     r0, _start              /* r0 <- current position of code   */
-               add     r0, r0, #4                              /* skip reset vector                    */
+               add     r0, r0, #4                              /* skip reset vector                    */
        mov     r2, #64                 /* r2 <- size to copy  */
        add     r2, r0, r2              /* r2 <- source end address         */
        mov     r1, #SRAM_OFFSET0         /* build vect addr */
@@ -438,22 +435,4 @@ fiq:
 arm1136_cache_flush:
                mcr     p15, 0, r1, c7, c5, 0   @ invalidate I cache
                mov     pc, lr                  @ back to caller
-
-#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR)
-/* Use the IntegratorCP function from board/integratorcp/platform.S */
-#else
-
-       .align  5
-.globl reset_cpu
-reset_cpu:
-       ldr     r1, rstctl      /* get addr for global reset reg */
-       mov     r3, #0x2        /* full reset pll+mpu */
-       str     r3, [r1]        /* force reset */
-       mov     r0, r0
-_loop_forever:
-       b       _loop_forever
-rstctl:
-       .word   PM_RSTCTRL_WKUP
-
-#endif
 #endif /* CONFIG_ONENAND_IPL */