From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 1/1 v3] bootm: add global bootm.{image/initrd}.loadaddr support
Date: Wed, 12 Sep 2012 16:13:54 +0200 [thread overview]
Message-ID: <1347459234-17676-1-git-send-email-plagnioj@jcrosoft.com> (raw)
To be able to pass the loadaddr of the image and the initrd.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
fix typo in doc
Best Regards,
J.
commands/bootm.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/commands/bootm.c b/commands/bootm.c
index 2d9f7f2..c03ca30 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -254,6 +254,19 @@ static char *bootm_image_name_and_no(const char *name, int *no)
#define BOOTM_OPTS BOOTM_OPTS_COMMON
#endif
+unsigned long long getenv_loadaddr(const char *name)
+{
+ const char *valstr = getenv(name);
+
+ if (!valstr)
+ return UIMAGE_SOME_ADDRESS;
+
+ if (valstr[0] == '\0')
+ return UIMAGE_SOME_ADDRESS;
+
+ return simple_strtoull(valstr, NULL, 0);
+}
+
static int do_bootm(int argc, char *argv[])
{
int opt;
@@ -273,8 +286,11 @@ static int do_bootm(int argc, char *argv[])
oftree = getenv("global.bootm.oftree");
os_file = getenv("global.bootm.image");
- if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD))
+ data.os_address = getenv_loadaddr("global.bootm.image.loadaddr");
+ data.initrd_address = getenv_loadaddr("global.bootm.initrd.loadaddr");
+ if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD)) {
initrd_file = getenv("global.bootm.initrd");
+ }
while ((opt = getopt(argc, argv, BOOTM_OPTS)) > 0) {
switch(opt) {
@@ -446,9 +462,12 @@ static int bootm_init(void)
{
globalvar_add_simple("bootm.image");
+ globalvar_add_simple("bootm.image.loadaddr");
globalvar_add_simple("bootm.oftree");
- if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD))
+ if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD)) {
globalvar_add_simple("bootm.initrd");
+ globalvar_add_simple("bootm.initrd.loadaddr");
+ }
return 0;
}
@@ -480,7 +499,9 @@ BAREBOX_CMD_END
BAREBOX_MAGICVAR(bootargs, "Linux Kernel parameters");
BAREBOX_MAGICVAR_NAMED(global_bootm_image, global.bootm.image, "bootm default boot image");
+BAREBOX_MAGICVAR_NAMED(global_bootm_image_loadaddr, global.bootm.image.loadaddr, "bootm default boot image loadaadr");
BAREBOX_MAGICVAR_NAMED(global_bootm_initrd, global.bootm.initrd, "bootm default initrd");
+BAREBOX_MAGICVAR_NAMED(global_bootm_initrd_loadaddr, global.bootm.initrd.loadaddr, "bootm default initrd loadaadr");
static struct binfmt_hook binfmt_uimage_hook = {
.type = filetype_uimage,
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2012-09-12 14:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 14:13 Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-09-12 15:41 ` Sascha Hauer
2012-09-12 15:46 ` Jean-Christophe PLAGNIOL-VILLARD
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=1347459234-17676-1-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