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/cpu/start-pbl.c | |
| 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/cpu/start-pbl.c')
| -rw-r--r-- | arch/arm/cpu/start-pbl.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index 04b54304e1..9327521b88 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -44,6 +44,18 @@ void __naked __section(.text_head_entry) pbl_start(void) barebox_arm_head(); } +/* + * The actual reset vector. This code is position independent and usually + * does not run at the address it's linked at. + */ +#ifndef CONFIG_MACH_DO_LOWLEVEL_INIT +void __naked __bare_init reset(void) +{ + common_reset(); + board_init_lowlevel_return(); +} +#endif + extern void *input_data; extern void *input_data_end; |