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/friendlyarm-mini2440 | |
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/friendlyarm-mini2440')
-rw-r--r-- | arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S b/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S index 827cf0016b..5c06b1cedc 100644 --- a/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S +++ b/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S @@ -4,15 +4,15 @@ #include <config.h> #include <mach/s3c-iomap.h> +#include <asm/barebox-arm-head.h> - .section ".text_bare_init.board_init_lowlevel","ax" + .section ".text_bare_init.reset","ax" /* ------------------------------------------------------------------------ */ -.globl board_init_lowlevel -board_init_lowlevel: - - mov r10, lr /* save the link register */ +.globl reset +reset: + common_reset r0 bl s3c24x0_disable_wd @@ -22,7 +22,7 @@ board_init_lowlevel: cmp pc, #S3C_SDRAM_END bhs 1f - mov pc, r10 + b board_init_lowlevel_return /* we are running from NOR or NAND/SRAM memory. Do further initialisation */ 1: @@ -31,9 +31,7 @@ board_init_lowlevel: bl s3c24x0_sdram_init #ifdef CONFIG_S3C_NAND_BOOT - mov lr, r10 /* restore the link register */ /* up to here we are running from the internal SRAM area */ - b s3c24x0_nand_boot /* does return directly to our caller into SDRAM */ -#else - mov pc, r10 + bl s3c24x0_nand_boot #endif + b board_init_lowlevel_return |