From: Christoph Fritz <chf.fritz@googlemail.com>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: regression: ARM: pca100: Use _text rather than TEXT_BASE
Date: Mon, 1 Oct 2012 18:24:01 +0200 [thread overview]
Message-ID: <20121001162400.GA29504@lovely.krouter> (raw)
In-Reply-To: <1347391260.4361.12.camel@mars>
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*
---
Subject: [PATCH] ARM: pca100: revert TEXT_BASE changes
This reverts commit 244198ea8bdf592799ebfd430fe9ab165284e480
its changes for pca100.
---
arch/arm/boards/phycard-i.MX27/lowlevel_init.S | 8 ++++++--
arch/arm/boards/phycard-i.MX27/pca100.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boards/phycard-i.MX27/lowlevel_init.S b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
index 0907382..7b700c5 100644
--- a/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
+++ b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
@@ -115,7 +115,7 @@ board_init_lowlevel:
bhi ret
/* Move ourselves out of NFC SRAM */
- ldr r1, =_text
+ ldr r1, =TEXT_BASE
copy_loop:
ldmia r0!, {r3-r9} /* copy from source address [r0] */
@@ -125,7 +125,11 @@ copy_loop:
ldr pc, =1f /* Jump to SDRAM */
1:
- b nand_boot /* Load barebox from NAND Flash */
+ bl nand_boot /* Load barebox from NAND Flash */
+
+ ldr r1, =IMX_NFC_BASE - TEXT_BASE
+ sub r10, r10, r1 /* adjust return address from NFC SRAM */
+ /* to SDRAM */
#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 b77e532..3e60ccd 100644
--- a/arch/arm/boards/phycard-i.MX27/pca100.c
+++ b/arch/arm/boards/phycard-i.MX27/pca100.c
@@ -339,7 +339,7 @@ console_initcall(pca100_console_init);
#ifdef CONFIG_NAND_IMX_BOOT
void __bare_init nand_boot(void)
{
- imx_nand_load_image(_text, barebox_image_size);
+ imx_nand_load_image((void *)TEXT_BASE, barebox_image_size);
}
#endif
--
1.7.2.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-10-01 16:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 19:21 Christoph Fritz
2012-10-01 16:24 ` Christoph Fritz [this message]
2012-10-01 17:00 ` Sascha Hauer
2012-10-02 6:49 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121001162400.GA29504@lovely.krouter \
--to=chf.fritz@googlemail.com \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox