[PATCH 07/14] bootm: handle initrds inline

[Jean-Christophe PLAGNIOL-VILLARD]

On 10:19 Wed 07 Dec     , Sascha Hauer wrote:
> On Tue, Dec 06, 2011 at 04:08:20PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 09:02 Mon 28 Nov     , Sascha Hauer wrote:
> > > Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> > > ---
> > > +
> > > +				data.initrd = get_fake_image_handle(&data, num);
> > this can not work
> > 
> > get_fake_image_handle expect the uImage is mapped
> 
> Yes, you're right.
> 
> > 
> > attached patch fix it
> > 
> 
> How about the following instead? I think it's a bit cleaner to
> completely move the initrd code out of the option parsing.
> 
> Sascha
> 
> >From 5128a2d2badace6102dc5461408ceaa47d0e9cc1 Mon Sep 17 00:00:00 2001
> From: Sascha Hauer <s.hauer at pengutronix.de>
> Date: Tue, 6 Dec 2011 08:44:05 +0100
> Subject: [PATCH] bootm: factor out initrd code from option parser
> 
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> ---
>  commands/bootm.c |   26 +++++++++++++++-----------
>  1 files changed, 15 insertions(+), 11 deletions(-)
> 
> diff --git a/commands/bootm.c b/commands/bootm.c
> index 859ec28..f97a842 100644
> --- a/commands/bootm.c
> +++ b/commands/bootm.c
> @@ -121,6 +121,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
>  	struct image_handle *os_handle = NULL;
>  	struct image_handler *handler;
>  	struct image_data data;
> +	const char *initrdname = NULL;
>  	int ret = 1;
>  
>  	memset(&data, 0, sizeof(struct image_data));
> @@ -136,17 +137,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
>  			data.initrd_address = simple_strtoul(optarg, NULL, 0);
>  			break;
>  		case 'r':
> -			printf("use initrd %s\n", optarg);
> -			/* check for multi image @<num> */
> -			if (optarg[0] == '@') {
> -				int num = simple_strtol(optarg + 1, NULL, 0);
> -
> -				data.initrd = get_fake_image_handle(&data, num);
> -			} else {
> -				data.initrd = map_image(optarg, data.verify);
> -			}
> -			if (!data.initrd)
> -				goto err_out;
> +			initrdname = optarg;
>  			break;
>  		default:
>  			break;
> @@ -171,6 +162,19 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
>  		goto err_out;
>  	}
>  
> +	if (initrdname) {
> +		/* check for multi image @<num> */
> +		if (initrdname[0] == '@') {
> +			int num = simple_strtol(optarg + 1, NULL, 0);
> +
> +			data.initrd = get_fake_image_handle(&data, num);
> +		} else {
> +			data.initrd = map_image(optarg, data.verify);
> +		}
> +		if (!data.initrd)
> +			goto err_out;
> +	}
> +
ok

Best Regards,
J.