diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:19:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:19:30 +0200 |
| commit | 638e059aba994dc8a77f81ad5e826f1706aecc00 (patch) | |
| tree | a4c860240169dd1acbae19d4f83822073d34a177 /arch/arm/mach-ep93xx | |
| parent | 90d92b359de4e5c52a1ff0b9272b5005484e7941 (diff) | |
| parent | faf7b7af6e51a33b88453821d792c89a84f72b1d (diff) | |
| download | barebox-638e059aba994dc8a77f81ad5e826f1706aecc00.tar.gz barebox-638e059aba994dc8a77f81ad5e826f1706aecc00.tar.xz | |
Merge branch 'for-next/arm-board-reset'
Conflicts:
arch/arm/cpu/start-reset.c
arch/arm/include/asm/barebox-arm.h
arch/arm/mach-omap/Kconfig
arch/arm/mach-omap/omap3_core.S
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/lowlevel_init.S | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-ep93xx/lowlevel_init.S b/arch/arm/mach-ep93xx/lowlevel_init.S index 13073d7379..6de53dd2f5 100644 --- a/arch/arm/mach-ep93xx/lowlevel_init.S +++ b/arch/arm/mach-ep93xx/lowlevel_init.S @@ -21,12 +21,11 @@ */ #include <mach/ep93xx-regs.h> +#include <asm/barebox-arm-head.h> -.globl board_init_lowlevel -board_init_lowlevel: - /* backup return address */ - ldr r1, =SYSCON_SCRATCH0 - str lr, [r1] +.globl reset +reset: + common_reset r0 /* Turn on both LEDs */ bl red_LED_on @@ -53,8 +52,4 @@ board_init_lowlevel: orr r0, r0, #0xc0000000 mcr p15, 0, r0, c1, c0, 0 - /* restore return address */ - ldr r1, =SYSCON_SCRATCH0 - ldr lr, [r1] - - mov pc, lr + b board_init_lowlevel_return |