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/boards/panda | |
| 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/boards/panda')
| -rw-r--r-- | arch/arm/boards/panda/lowlevel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/boards/panda/lowlevel.c b/arch/arm/boards/panda/lowlevel.c index 55c4c3fc0a..3a241489be 100644 --- a/arch/arm/boards/panda/lowlevel.c +++ b/arch/arm/boards/panda/lowlevel.c @@ -23,6 +23,7 @@ #include <mach/omap4-clock.h> #include <mach/syslib.h> #include <asm/barebox-arm.h> +#include <asm/barebox-arm-head.h> #define TPS62361_VSEL0_GPIO 7 @@ -73,15 +74,17 @@ static void noinline panda_init_lowlevel(void) board_init_lowlevel_return(); } -void board_init_lowlevel(void) +void reset(void) { u32 r; + common_reset(); + if (get_pc() > 0x80000000) return; r = 0x4030d000; - __asm__ __volatile__("mov sp, %0" : : "r"(r)); + __asm__ __volatile__("mov sp, %0" : : "r"(r)); panda_init_lowlevel(); } |