[PATCH] Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"

[Matt Porter]

On Tue, Mar 31, 2020 at 01:59:20AM -0700, Ye Li wrote:
> The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct,
> it will append fdt to each loadable image.
> Actually when using TINY FIT, the first loadable image is thought as u-boot
> and already have fdt appended.
> 
> Signed-off-by: Ye Li <ye.li at nxp.com>

Hi,

I just rebased an i.mx8mm board from v2020.04-rc4 to v2020.04-rc5 that
I'm preparing for submission upstream and noticed that this commit
broke start of U-Boot. Reverting this or disabling FIT_IMAGE_TINY fixes
it.

-Matt

> ---
>  common/spl/spl_fit.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
> index aef1dbd..69dabd2 100644
> --- a/common/spl/spl_fit.c
> +++ b/common/spl/spl_fit.c
> @@ -646,10 +646,6 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
>  
>  		if (!spl_fit_image_get_os(fit, node, &os_type))
>  			debug("Loadable is %s\n", genimg_get_os_name(os_type));
> -#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY)
> -		else
> -			os_type = IH_OS_U_BOOT;
> -#endif
>  
>  		if (os_type == IH_OS_U_BOOT) {
>  			spl_fit_append_fdt(&image_info, info, sector,
> -- 
> 2.7.4
>