[U-Boot] [PATCH 2/4] blackfin: x86: bootm: Handle PREP stage of bootm

Sughosh Ganu urwithsughosh at gmail.com
Fri Jul 12 10:28:05 CEST 2013


On Wed Jul 10, 2013 at 11:08:09PM -0700, Simon Glass wrote:
> The OS function is now always called with the PREP stage. Adjust the
> remaining bootm OS functions to deal with this correctly.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>  arch/blackfin/lib/boot.c |  2 ++
>  arch/x86/lib/bootm.c     |  2 ++
>  common/cmd_bootm.c       | 16 ++++++++++++++++
>  3 files changed, 20 insertions(+)
> 
> diff --git a/arch/blackfin/lib/boot.c b/arch/blackfin/lib/boot.c
> index 768a882..5644d58 100644
> --- a/arch/blackfin/lib/boot.c
> +++ b/arch/blackfin/lib/boot.c
> @@ -42,6 +42,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
>  	int	(*appl) (char *cmdline);
>  	char	*cmdline;
>  
> +	if (flag & BOOTM_STATE_OS_PREP)
> +		return 0;
>  	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
>  		return 1;

Minor nit; A blank line between the two if conditions would be
good. Applies for all the hunks in this patch.

-sughosh



More information about the U-Boot mailing list