[U-Boot] [PATCH 2/2] arm: Check for valid FDT after console is up

[Tom Warren]

Simon,

> -----Original Message-----
> From: Simon Glass [mailto:sjg at chromium.org]
> Sent: Wednesday, March 28, 2012 1:08 PM
> To: U-Boot Mailing List
> Cc: Tom Warren; Stephen Warren; Albert Aribaud; Simon Glass
> Subject: [PATCH 2/2] arm: Check for valid FDT after console is up
> 
> When using CONFIG_OF_CONTROL, add a check that we have a valid FDT and
> panic() if not. This must be done after the console is ready.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

This works (u-boot.bin gives an error message and then resets). If you're happy with the constant reset loop and not a hang, I'm OK with it, too.

Tested-by: Tom Warren <twarren at nvidia.com>
Acked-by: Tom Warren <twarren at nvidia.com>

> ---
>  arch/arm/lib/board.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index
> 81293c3..ab88e9c 100644
> --- a/arch/arm/lib/board.c
> +++ b/arch/arm/lib/board.c
> @@ -291,6 +291,14 @@ void board_init_f(ulong bootflag)
>  		}
>  	}
> 
> +#ifdef CONFIG_OF_CONTROL
> +	/* For now, put this check after the console is ready */
> +	if (fdtdec_prepare_fdt()) {
> +		panic("** CONFIG_OF_CONTROL defined but no FDT - please see "
> +			"doc/README.fdt-control");
> +	}
> +#endif
> +
>  	debug("monitor len: %08lX\n", gd->mon_len);
>  	/*
>  	 * Ram is setup, size stored in gd !!
> --
> 1.7.7.3
-- 
nvpublic