Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"
authorYe Li <ye.li@nxp.com>
Wed, 1 Apr 2020 14:42:04 +0000 (07:42 -0700)
committerTom Rini <trini@konsulko.com>
Fri, 3 Apr 2020 15:29:23 +0000 (11:29 -0400)
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@nxp.com>
Tested-by: Fabio Estevam <festevam@gmail.com>
common/spl/spl_fit.c

index aef1dbdd49acf6722afee4e4abc9f97b8b6ec04c..69dabd27f6d9d330ac7efdd7356945dce595dc55 100644 (file)
@@ -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,