From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/3] ARM: i.MX: external NAND boot: use image size from image header
Date: Wed, 29 Jan 2014 12:05:08 +0100 [thread overview]
Message-ID: <1390993508-10287-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1390993508-10287-1-git-send-email-s.hauer@pengutronix.de>
When compiling with multiimage support ld_var(_barebox_image_size) only
contains the length of the PBL image, but not including the appended
compressed data. With this patch the image size is read from the barebox
header instead which contains the correct size, either from the linker
or from the fix_size tool.
This makes the external_nand_boot compatible with multiimage support.
Tested on Phytec phyCARD-i.MX27 with and without PBL.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/external-nand-boot.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-imx/external-nand-boot.c b/arch/arm/mach-imx/external-nand-boot.c
index fab37bf..c08806c 100644
--- a/arch/arm/mach-imx/external-nand-boot.c
+++ b/arch/arm/mach-imx/external-nand-boot.c
@@ -322,10 +322,13 @@ void __noreturn BARE_INIT_FUNCTION(imx##soc##_boot_nand_external_cont) \
(uint32_t boarddata) \
{ \
unsigned long nfc_base = MX##soc##_NFC_BASE_ADDR; \
- unsigned long sdram = MX##soc##_CSD0_BASE_ADDR; \
+ void *sdram = (void *)MX##soc##_CSD0_BASE_ADDR; \
+ uint32_t image_size; \
+ \
+ image_size = *(uint32_t *)(sdram + 0x2c); \
\
- imx##soc##_nand_load_image((void *)sdram, \
- ld_var(_barebox_image_size), \
+ imx##soc##_nand_load_image(sdram, \
+ image_size, \
(void *)nfc_base, \
imx##soc##_pagesize_2k()); \
\
--
1.8.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-01-29 11:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 11:05 [PATCH 1/3] scripts: fix_size: check magic Sascha Hauer
2014-01-29 11:05 ` [PATCH 2/3] images: fix image size in pblx Sascha Hauer
2014-01-29 11:05 ` Sascha Hauer [this message]
2014-01-31 17:57 ` [PATCH 1/3] scripts: fix_size: check magic 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=1390993508-10287-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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