提交 585b468a 编写于 作者: D Dario Binacchi 提交者: Tom Rini

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: NDario Binacchi <dariobin@libero.it>
Reviewed-by: NMichael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
上级 146a17ad
......@@ -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 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册