[U-Boot] [PATCH v4 1/6] common/image-fdt.c: Make boot_get_fdt() perform a check for Android images

[Tom Rini]

On Wed, Jan 13, 2016 at 04:53:15PM +0800, Jeffy Chen wrote:

> Android images don't have a fdt.
> 
> Signed-off-by: Jeffy Chen <jeffy.chen at rock-chips.com>
> Acked-by: Simon Glass <sjg at chromium.org>
> ---
> 
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
> 
>  common/image-fdt.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/common/image-fdt.c b/common/image-fdt.c
> index 5e4e5bd..41aaa0d 100644
> --- a/common/image-fdt.c
> +++ b/common/image-fdt.c
> @@ -379,6 +379,10 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
>  				       (long)fdt_addr);
>  			}
>  			break;
> +#ifdef CONFIG_ANDROID_BOOT_IMAGE
> +		case IMAGE_FORMAT_ANDROID:
> +			goto no_fdt;
> +#endif
>  		default:
>  			puts("ERROR: Did not find a cmdline Flattened Device Tree\n");
>  			goto no_fdt;

Hang on, this doesn't seem right.  Rob or Paul can you comment more
here?  I know we've gone through some issues in the past with respect to
booting Android and FDT.  Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-rockchip/attachments/20160113/f80d1ba1/attachment.sig>