From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 19.mo4.mail-out.ovh.net ([87.98.179.66] helo=mo4.mail-out.ovh.net) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TO8ZC-0006yw-DY for barebox@lists.infradead.org; Tue, 16 Oct 2012 14:56:23 +0000 Received: from mail97.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo4.mail-out.ovh.net (Postfix) with SMTP id E427F104FBB1 for ; Tue, 16 Oct 2012 17:02:58 +0200 (CEST) Date: Tue, 16 Oct 2012 16:54:01 +0200 From: Jean-Christophe PLAGNIOL-VILLARD Message-ID: <20121016145401.GA30038@game.jcrosoft.org> References: <1347464902-2127-1-git-send-email-plagnioj@jcrosoft.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1347464902-2127-1-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v4] bootm: add global bootm.{image/initrd}.loadaddr support To: barebox@lists.infradead.org On 17:48 Wed 12 Sep , Jean-Christophe PLAGNIOL-VILLARD wrote: > To be able to pass the loadaddr of the image and the initrd. > can we have this on master > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > commands/bootm.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/commands/bootm.c b/commands/bootm.c > index 2d9f7f2..dfd9ac9 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 > > +static 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