| Message ID | 1552291694-20407-1-git-send-email-abel.vesa@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/2] common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled | expand |
On 3/11/19 9:08 AM, Abel Vesa wrote: > If FIT_IMAGE_TINY is enabled, spl_fit_image_get_os returns -ENOTSUPP. > In this case, we should default to IH_OS_U_BOOT not to IH_OS_INVALID. > > Signed-off-by: Abel Vesa <abel.vesa@nxp.com> > --- > common/spl/spl_fit.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c > index db43626..b190612 100644 > --- a/common/spl/spl_fit.c > +++ b/common/spl/spl_fit.c > @@ -491,6 +491,8 @@ 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)); > + else > + os_type = IH_OS_U_BOOT; Don't you need if CONFIG_IS_ENABLED(FIT_IMAGE_TINY) around this new code ? > if (os_type == IH_OS_U_BOOT) { > spl_fit_append_fdt(&image_info, info, sector, >
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index db43626..b190612 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -491,6 +491,8 @@ 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)); + else + os_type = IH_OS_U_BOOT; if (os_type == IH_OS_U_BOOT) { spl_fit_append_fdt(&image_info, info, sector,
If FIT_IMAGE_TINY is enabled, spl_fit_image_get_os returns -ENOTSUPP. In this case, we should default to IH_OS_U_BOOT not to IH_OS_INVALID. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> --- common/spl/spl_fit.c | 2 ++ 1 file changed, 2 insertions(+)