From: Sascha Hauer <s.hauer@pengutronix.de>
To: Michael Olbrich <m.olbrich@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] ARM Samsung: fix booting from NAND without pbl
Date: Wed, 25 Feb 2015 08:31:08 +0100 [thread overview]
Message-ID: <20150225073108.GR12209@pengutronix.de> (raw)
In-Reply-To: <1424789630-10461-1-git-send-email-m.olbrich@pengutronix.de>
On Tue, Feb 24, 2015 at 03:53:48PM +0100, Michael Olbrich wrote:
> This was broken in 558d72dc5116 (ARM Samsung: fix booting from NAND with
> pbl). '_text' is TEXT_BASE when building without pbl and (TEXT_BASE -
> SZ_2M) when building with pbl, so this works in both cases.
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
>
> I hope I understood how this should work and this is correct now. It worked
> for me with and without pbl. Anything else that could mess this up?
>
> Michael
>
> arch/arm/mach-samsung/lowlevel-s3c24x0.S | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-samsung/lowlevel-s3c24x0.S b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
> index 626ad0418778..d43cdff52863 100644
> --- a/arch/arm/mach-samsung/lowlevel-s3c24x0.S
> +++ b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
> @@ -15,7 +15,6 @@
> */
>
> #include <config.h>
> -#include <linux/sizes.h>
> #include <mach/s3c-iomap.h>
>
> .section ".text_bare_init.s3c24x0_disable_wd","ax"
> @@ -251,7 +250,7 @@ s3c24x0_nand_boot:
> beq 2f
> mov pc, lr /* NOR case: nothing to do here */
>
> -2: ldr sp, =(TEXT_BASE - SZ_2M) /* Setup a temporary stack in SDRAM */
> +2: ldr sp, =_text /* Setup a temporary stack in SDRAM */
> /*
> * We still run at a location we are not linked to. But lets still running
> * from the internal SRAM, this may speed up the boot
> @@ -262,7 +261,7 @@ s3c24x0_nand_boot:
> /*
> * Adjust the return address to the correct address in SDRAM
> */
> - ldr r1, =(TEXT_BASE - SZ_2M)
> + ldr r1, =_text
Since nand_boot() copies the image to _text I believe this is the
correct address in all cases. Applied, thanks
Sascha
--
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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2015-02-25 7:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 14:53 Michael Olbrich
2015-02-24 14:53 ` [PATCH 2/3] friendlyarm-mini2440: add support for the W35 display Michael Olbrich
2015-02-25 7:36 ` Sascha Hauer
2015-02-24 14:53 ` [PATCH 3/3] ARM Samsung: add simple NAND barebox update handler Michael Olbrich
2015-02-25 7:34 ` Sascha Hauer
2015-02-25 16:48 ` [PATCH] " Michael Olbrich
2015-02-26 5:58 ` Sascha Hauer
2015-02-25 7:31 ` Sascha Hauer [this message]
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=20150225073108.GR12209@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=m.olbrich@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