regression: ARM: pca100: Use _text rather than TEXT_BASE

[Sascha Hauer]

On Mon, Oct 01, 2012 at 06:24:01PM +0200, Christoph Fritz wrote:
> On Tue, Sep 11, 2012 at 09:21:00PM +0200, Christoph Fritz wrote:
> > Hi Sascha,
> > 
> > your commit 244198e "ARM boards: Use _text rather than TEXT_BASE"
> > breaks board pca100 (phycard-i.MX27): It doesn't boot.
> > 
> > Revering the patch fixes the problem.
> > 
> > Any ideas?
> 
> *ping*

Sorry, missed this one.

Does the following fix it?

8<------------------------------------------------------------

>From d199fdf0b57879485fcde51c6a4e4d6e316816ee Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer at pengutronix.de>
Date: Mon, 1 Oct 2012 18:58:16 +0200
Subject: [PATCH] ARM i.MX pca100: Add missing jump to
 board_init_lowlevel_return()

This is broken since:

| commit 244198ea8bdf592799ebfd430fe9ab165284e480
| Author: Sascha Hauer <s.hauer at 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 at pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/boards/phycard-i.MX27/pca100.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c
index 614bfc6..4b6e26e 100644
--- a/arch/arm/boards/phycard-i.MX27/pca100.c
+++ b/arch/arm/boards/phycard-i.MX27/pca100.c
@@ -329,6 +329,7 @@ console_initcall(pca100_console_init);
 void __bare_init nand_boot(void)
 {
 	imx_nand_load_image(_text, barebox_image_size);
+	board_init_lowlevel_return();
 }
 #endif
 
-- 
1.7.10.4

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |