[U-Boot] [PATCH v1] fdt: Allow non-FDT kernels to boot when CONFIG_OF_LIBFDT is defined

[Hans de Goede]

Hi,

On 11/21/2014 12:55 AM, Suriyan Ramasami wrote:
> The boot commands - bootz/bootm mandate a third argument which is the
> address to the FDT blob. In cases where this argument is not specified,
> boot fails with a message indicating a missing FDT.
> 
> This causes non-FDT kernels to fail to boot. This patch allows both FDT
> and non-FDT kernels to boot by making the third parameter to the bootm/bootz
> optional.
> 
> Signed-off-by: Suriyan Ramasami <suriyan.r at gmail.com>

Looks good, and works for my case (booting old linux-sunxi 3.4 kernels) too) :

Tested-by: Hans de Goede <hdegoede at redhat.com>
Acked-by: Hans de Goede <hdegoede at redhat.com>

Thanks & Regards,

Hans

> ---
> 
> Changes in v1:
> - First try
> 
>  common/image-fdt.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/common/image-fdt.c b/common/image-fdt.c
> index a39ae1b..1a02166 100644
> --- a/common/image-fdt.c
> +++ b/common/image-fdt.c
> @@ -430,6 +430,10 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
>  error:
>  	*of_flat_tree = NULL;
>  	*of_size = 0;
> +	if (argc <= 2) {
> +		debug("Continuing to boot without FDT\n");
> +		return 0;
> +	}
>  	return 1;
>  }
>  
>