]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled
authorAbel Vesa <abel.vesa@nxp.com>
Tue, 12 Mar 2019 08:34:31 +0000 (08:34 +0000)
committerTom Rini <trini@konsulko.com>
Fri, 22 Mar 2019 16:15:05 +0000 (12:15 -0400)
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>
Tested-by: Fabio Estevam <festevam@gmail.com>
common/spl/spl_fit.c

index db436268cbcd6051e148121228651ab1bbe6b4b1..c9bfe0cc8aee0808248a61ea0d347a4954b18e6d 100644 (file)
@@ -491,6 +491,10 @@ 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,