spl: fit: fail fit loading in case of FDT appending error

If uboot does not embed its device tree and the FIT loading function
returns error in case of failure in the FDT append, the redundant itb
image could be loaded.

cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dariobin@libero.it>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index f581a2242132e29903df4b018a8bc4af5980075e..365104fe0288b5335a397adaec8913a4985536fb 100644 (file)
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -619,9 +619,12 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
         * Booting a next-stage U-Boot may require us to append the FDT.
         * We allow this to fail, as the U-Boot image might embed its FDT.
         */
-       if (spl_image->os == IH_OS_U_BOOT)
-               spl_fit_append_fdt(spl_image, info, sector, fit,
-                                  images, base_offset);
+       if (spl_image->os == IH_OS_U_BOOT) {
+               ret = spl_fit_append_fdt(spl_image, info, sector, fit,
+                                        images, base_offset);
+               if (!IS_ENABLED(CONFIG_OF_EMBED) && ret < 0)
+                       return ret;
+       }
 
        firmware_node = node;
        /* Now check if there are more images for us to load */