sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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 244198ea8b
| 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>
This commit is contained in:
Sascha Hauer 2012-10-01 18:58:16 +02:00
parent 4062e094db
commit 47d0240b9c
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boards/phycard-i.MX27/lowlevel_init.S
View File

@ -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 */

8
arch/arm/boards/phycard-i.MX27/pca100.c
View File

@ -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