From: Ye Li Date: Wed, 1 Apr 2020 14:42:04 +0000 (-0700) Subject: Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled" X-Git-Tag: v2020.04-rc5~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d15d1d1c24f6d3a2bcc7f35c706d8c76c2960b0;p=oweals%2Fu-boot.git Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled" Commit cf8dcc5d02c3 ("common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled") 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 Tested-by: Fabio Estevam --- diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index aef1dbdd49..69dabd27f6 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,