mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 2/4] bootm: do not load the initrd in the common code
Date: Mon, 13 Aug 2012 08:57:12 +0200	[thread overview]
Message-ID: <1344841034-10068-2-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1344841034-10068-1-git-send-email-plagnioj@jcrosoft.com>

This need to be handled by the arch bootm as the address can be invalid and
provided at arch level.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/bootm.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/commands/bootm.c b/commands/bootm.c
index 3c47ab5..5f858e8 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -126,14 +126,6 @@ static int bootm_open_initrd_uimage(struct image_data *data)
 	if (data->initrd_address == UIMAGE_SOME_ADDRESS)
 		data->initrd_address = data->initrd->header.ih_load;
 
-	if (data->initrd_address != UIMAGE_INVALID_ADDRESS) {
-		data->initrd_res = uimage_load_to_sdram(data->initrd,
-				data->initrd_num,
-				data->initrd_address);
-		if (!data->initrd_res)
-			return -ENOMEM;
-	}
-
 	return 0;
 }
 
-- 
1.7.10.4


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

  reply	other threads:[~2012-08-13  6:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-13  6:54 [for master PATCH 0/4] Bootm uImage initrd fix Jean-Christophe PLAGNIOL-VILLARD
2012-08-13  6:57 ` [PATCH 1/4] arm/bootm: fix initrd_start init Jean-Christophe PLAGNIOL-VILLARD
2012-08-13  6:57   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-08-13  6:57   ` [PATCH 3/4] uimage_sdram_flush: fix resource start Jean-Christophe PLAGNIOL-VILLARD
2012-08-13  6:57   ` [PATCH 4/4] uimage_laod: fix ramdisk support Jean-Christophe PLAGNIOL-VILLARD
2012-08-13 18:38 ` [for master PATCH 0/4] Bootm uImage initrd fix 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=1344841034-10068-2-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --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