[U-Boot] [PATCH] spl: fit: Fix support for loading FPGA bitstream

[Tom Rini]

On Thu, May 31, 2018 at 06:09:14PM +0200, Marek Vasut wrote:
> Move the FPGA loading from IS_ENABLED(CONFIG_SPL_OS_BOOT) &&
> IS_ENABLED(CONFIG_SPL_GZIP) conditional. The FPGA loading can
> be used without OS loading and GZIP support in SPL. This issue
> was most likely induced by some merge conflict, so fix it.
> 
> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Tom Rini <trini at konsulko.com>
> ---
>  common/spl/spl_fit.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
> index 2321ebb0dd..255959d3a9 100644
> --- a/common/spl/spl_fit.c
> +++ b/common/spl/spl_fit.c
> @@ -185,16 +185,16 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
>  	int ret;
>  #endif
>  
> +	if (fit_image_get_type(fit, node, &type))
> +		puts("Cannot get image type.\n");
> +	else
> +		debug("%s ", genimg_get_type_name(type));
> +
>  	if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) {
>  		if (fit_image_get_comp(fit, node, &image_comp))
>  			puts("Cannot get image compression format.\n");
>  		else
>  			debug("%s ", genimg_get_comp_name(image_comp));
> -
> -		if (fit_image_get_type(fit, node, &type))
> -			puts("Cannot get image type.\n");
> -		else
> -			debug("%s ", genimg_get_type_name(type));
>  	}
>  
>  	if (fit_image_get_load(fit, node, &load_addr))

Ah, ugh.  That was my fault, but also because that move causes a number
of platforms to break size constraints (much of Allwinner, iirc).  You
need to make your new change here depend on CONFIG_SPL_FPGA_SUPPORT ||
(CONFIG_SPL_OS_BOOT && CONFIG_SPL_GZIP) or so, and throw it though
travis to make sure no platforms break.  Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180601/55203363/attachment.sig>