| Message ID | 1585752124-86772-1-git-send-email-ye.li@nxp.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled" | expand |
On Wed, Apr 01, 2020 at 07:42:04AM -0700, Ye Li wrote: > 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 <ye.li at nxp.com> > Tested-by: Fabio Estevam <festevam at gmail.com> Applied to u-boot/master, thanks!
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,
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 <ye.li at nxp.com> Tested-by: Fabio Estevam <festevam at gmail.com> --- Changes in v2: - Update the revert commit log to use kernel style common/spl/spl_fit.c | 4 ---- 1 file changed, 4 deletions(-)