| Message ID | 1585645160-108428-1-git-send-email-ye.li@nxp.com |
|---|---|
| State | Accepted |
| Commit | 9d15d1d1c24f6d3a2bcc7f35c706d8c76c2960b0 |
| Headers | show |
| Series | Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled" | expand |
Hi Ye Li, On Tue, Mar 31, 2020 at 6:00 AM Ye Li <ye.li at nxp.com> wrote: > > The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct, 1. "Patch in commit" is not correct. Please refer it to "commit" instead. 2. Please use the same kernel style to refer to commit: 12 SHA digit and the subject between (" xxx ") So this would become: 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 on a imx6q and imx6qp sabresd: Tested-by: Fabio Estevam <festevam at gmail.com> Thanks
On Tue, Mar 31, 2020 at 06:40:28AM -0300, Fabio Estevam wrote: > Hi Ye Li, > > On Tue, Mar 31, 2020 at 6:00 AM Ye Li <ye.li at nxp.com> wrote: > > > > The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct, > > 1. "Patch in commit" is not correct. Please refer it to "commit" instead. > > 2. Please use the same kernel style to refer to commit: 12 SHA digit > and the subject between (" xxx ") > > So this would become: > > 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 on a imx6q and imx6qp sabresd: > > Tested-by: Fabio Estevam <festevam at gmail.com> You should also mention that you're reverting the previous commit and I would really like Abel to confirm the problem they saw isn't reproducible. 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,
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> --- common/spl/spl_fit.c | 4 ---- 1 file changed, 4 deletions(-)