diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-01 18:58:16 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-02 08:42:03 +0200 |
commit | 47d0240b9cdcf9ed8aa166ae62fba5ac48e11bba (patch) | |
tree | c47a648e2fd865bf4ba3143dba04faed14cb6d0d | |
parent | 4062e094dbeb19e3f68b1406e6bd4ba4207ce288 (diff) | |
download | barebox-47d0240b9cdcf9ed8aa166ae62fba5ac48e11bba.tar.gz barebox-47d0240b9cdcf9ed8aa166ae62fba5ac48e11bba.tar.xz |
ARM i.MX pca100: Fix nand boot
The following missed to add a jump to board_init_lowlevel_return for the
phycard pca100 board:
| commit 244198ea8bdf592799ebfd430fe9ab165284e480
| Author: Sascha Hauer <s.hauer@pengutronix.de>
| Date: Sun Jul 8 18:30:42 2012 +0200
|
| ARM boards: Use _text rather than TEXT_BASE
|
| With compressed image support TEXT_BASE will become the base
| address of the uncompressed image. What the boards want instead
| is the base address of the decompressor code or, if not compressed,
| the base address of the uncompressed image. Use _text which is
| the correct one for both cases.
|
| Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This fixes it by adding the jump. Also imx_nand_load_image is directly
called from lowlevel_init.S which fixes compilation with pbl support
enabled.
Tested with both compression enabled and disabled.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/boards/phycard-i.MX27/lowlevel_init.S | 5 | ||||
-rw-r--r-- | arch/arm/boards/phycard-i.MX27/pca100.c | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/boards/phycard-i.MX27/lowlevel_init.S b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S index c24edd49da..f98364267d 100644 --- a/arch/arm/boards/phycard-i.MX27/lowlevel_init.S +++ b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S @@ -116,7 +116,10 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - b nand_boot /* Load barebox from NAND Flash */ + ldr r0,=_text + ldr r1,=_barebox_image_size + bl imx_nand_load_image + b board_init_lowlevel_return #endif /* CONFIG_NAND_IMX_BOOT */ diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c index 614bfc65eb..53eec8f6b6 100644 --- a/arch/arm/boards/phycard-i.MX27/pca100.c +++ b/arch/arm/boards/phycard-i.MX27/pca100.c @@ -324,11 +324,3 @@ static int pca100_console_init(void) } console_initcall(pca100_console_init); - -#ifdef CONFIG_NAND_IMX_BOOT -void __bare_init nand_boot(void) -{ - imx_nand_load_image(_text, barebox_image_size); -} -#endif - |