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 3/5] bootm: add -L option to specify the initrd load address
Date: Sat,  8 Oct 2011 16:29:51 +0200	[thread overview]
Message-ID: <1318084193-2648-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <20111008141722.GG10459@game.jcrosoft.org>

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/bootm.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/commands/bootm.c b/commands/bootm.c
index afb9e06..f11138a 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -191,7 +191,18 @@ static struct image_handle *get_fake_image_handle(struct image_data *data, int n
 static int initrd_handler_parse_options(struct image_data *data, int opt,
 		char *optarg)
 {
+	uint32_t initrd_start;
+
 	switch(opt) {
+	case 'L':
+		if (!data->initrd) {
+			eprintf("Warning -L ingnored. Specify the initrd first\n");
+			break;
+		}
+		initrd_start = simple_strtoul(optarg, NULL, 0);
+		printf("initrd_start=0x%x\n", initrd_start);
+		data->initrd->header.ih_load = cpu_to_uimage(initrd_start);
+		break;
 	case 'r':
 		printf("use initrd %s\n", optarg);
 		/* check for multi image @<num> */
@@ -204,16 +215,19 @@ static int initrd_handler_parse_options(struct image_data *data, int opt,
 		}
 		if (!data->initrd)
 			return -1;
-		return 0;
+		break;
 	default:
 		return 1;
 	}
+
+	return 0;
 }
 
 static struct image_handler initrd_handler = {
-	.cmdline_options = "r:",
+	.cmdline_options = "r:L:",
 	.cmdline_parse = initrd_handler_parse_options,
-	.help_string = " -r <initrd>    specify an initrd image",
+	.help_string = " -r <initrd>    specify an initrd image\n"
+		       " -L <load addr> specify initrd load address",
 };
 
 static int initrd_register_image_handler(void)
-- 
1.7.6.3


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

  parent reply	other threads:[~2011-10-08 14:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-08 14:17 [PATCH 0/5] Multi uImage support on ARM Jean-Christophe PLAGNIOL-VILLARD
2011-10-08 14:29 ` [PATCH 1/5] bootm: ensure the uImage is mapped first to allow option to used it Jean-Christophe PLAGNIOL-VILLARD
2011-10-08 14:29 ` [PATCH 2/5] get_fake_image_handle: set nb_data_entries to 1 and update the header size Jean-Christophe PLAGNIOL-VILLARD
2011-10-08 14:29 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2011-10-08 14:29 ` [PATCH 4/5] arm/bootm: enable multi uimage support Jean-Christophe PLAGNIOL-VILLARD
2011-10-08 14:29 ` [PATCH 5/5] defaultenv: add bootm_opt var to allow the board to pass parameter to bootm Jean-Christophe PLAGNIOL-VILLARD
2011-10-09  9:37 ` [PATCH 0/5] Multi uImage support on ARM Sascha Hauer
2011-10-10 22:06   ` Jean-Christophe PLAGNIOL-VILLARD
2011-10-12  6:55     ` 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=1318084193-2648-3-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