diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-14 21:24:37 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-15 19:46:56 +0200 |
| commit | c65edd657dd5f9260e0468198427d60129f17179 (patch) | |
| tree | 55fcc326c0ba2f06f3a7346295cd69b2b3af2ff8 /arch/arm/boards/a9m2440 | |
| parent | 840d4858d0aa7137e2e6b582c9303d9391536b37 (diff) | |
| download | barebox-c65edd657dd5f9260e0468198427d60129f17179.tar.gz barebox-c65edd657dd5f9260e0468198427d60129f17179.tar.xz | |
ARM a9m2440: Fix lowlevel init
board_init_lowlevel is no longer called from generic code, so we can't
just return from in. Instead we have to jump to board_init_lowlevel_return
manually. For the a9m2440 board one case was missed to convert. This
is broken since:
| commit faf7b7af6e51a33b88453821d792c89a84f72b1d
| Author: Jan Luebbe <jlu@pengutronix.de>
| Date: Mon Sep 24 10:18:34 2012 +0200
|
| ARM: give boards control of the reset entry point
|
| On some SoCs (for example AM35xx), the ROM bootloader passes useful
| information in r0 when jumping to barebox.
|
| To avoid overwriting this in the generic reset code, we introduce
| common_reset as a C function and as an assembler macro. This is then
| called form the reset entry point (either in common or in board code).
|
| This patch is based on code by Sascha Hauer <s.hauer@pengutronix.de>.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/a9m2440')
| -rw-r--r-- | arch/arm/boards/a9m2440/lowlevel_init.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/a9m2440/lowlevel_init.S b/arch/arm/boards/a9m2440/lowlevel_init.S index da29efdc21..8f6cfcbe68 100644 --- a/arch/arm/boards/a9m2440/lowlevel_init.S +++ b/arch/arm/boards/a9m2440/lowlevel_init.S @@ -225,7 +225,7 @@ reset: 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: |