mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH RFC 2/2] Don't honor initrd load address
Date: Thu,  2 May 2013 11:07:12 +0200	[thread overview]
Message-ID: <1367485632-10725-3-git-send-email-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <1367485632-10725-1-git-send-email-u.kleine-koenig@pengutronix.de>

From: Sascha Hauer <s.hauer@pengutronix.de>

U-Boot doesn't honor the load address specified in an initrd. Barebox
shouldn't be more strict here. This unbreaks booting an uInitrd
generated by Debian's flash-kernel that uses 0 as entry address where
there is nothing on the i.MX53 that was used.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 commands/bootm.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/commands/bootm.c b/commands/bootm.c
index bb44776..5dd1703 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -127,9 +127,6 @@ static int bootm_open_initrd_uimage(struct image_data *data)
 		data->initrd = data->os;
 	}
 
-	if (data->initrd_address == UIMAGE_INVALID_ADDRESS)
-		data->initrd_address = data->initrd->header.ih_load;
-
 	return 0;
 }
 
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2013-05-02  9:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-02  9:07 [PATCH RFC 0/2] Fix uInitrd handling Uwe Kleine-König
2013-05-02  9:07 ` [PATCH RFC 1/2] bootm: Simplify initrd address handling Uwe Kleine-König
2013-05-03  4:24   ` Sascha Hauer
2013-05-02  9:07 ` Uwe Kleine-König [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=1367485632-10725-3-git-send-email-u.kleine-koenig@pengutronix.de \
    --to=u.kleine-koenig@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