diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:05:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:05:42 +0200 |
| commit | 62479b181460f5bf99517b68059d5ba87908edd3 (patch) | |
| tree | a68933d5d6b6ab8d06c107c421d6abb5d1669e74 /cpu/arm1136/start.S | |
| parent | 5c395393cc9b85b14c5481dbcab6b67b54f31622 (diff) | |
| parent | 066bebd6353e33af3adefc3404560871699e9961 (diff) | |
| download | u-boot-imx-62479b181460f5bf99517b68059d5ba87908edd3.zip u-boot-imx-62479b181460f5bf99517b68059d5ba87908edd3.tar.gz u-boot-imx-62479b181460f5bf99517b68059d5ba87908edd3.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
Diffstat (limited to 'cpu/arm1136/start.S')
| -rw-r--r-- | cpu/arm1136/start.S | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S index 8b765f1..56009d0 100644 --- 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 @@ -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 */ |