On 22:41 Tue 16 Oct , Sascha Hauer wrote:
> On Wed, Sep 12, 2012 at 05:48:22PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > To be able to pass the loadaddr of the image and the initrd.
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> > ---
> > 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");
>
> This needs to be in the 'if' below.
no need if not present the address as set to SOME_ADDRESS
and this save nearly no space 8 bytes
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
