Hi Dario
On Mon, May 11, 2020 at 8:43 AM Dario Binacchi <dario...@libero.it> wrote:
>
> 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 <mich...@amarulasolutions.com>
> Signed-off-by: Dario Binacchi <dario...@libero.it>
>
> ---
>
> Changes in v2:
> - Replace CONFIG_IS_ENABLED(OF_EMBED) with IS_ENABLED(CONFIG_OF_EMBED))
>
> common/spl/spl_fit.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
> index c51e4beb1c..42c354c908 100644
> --- a/common/spl/spl_fit.c
> +++ b/common/spl/spl_fit.c
> @@ -617,9 +617,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;
> + }
>
Reviewed-by: Michael Trimarchi <mich...@amarulasolutions.com>
> firmware_node = node;
> /* Now check if there are more images for us to load */
> --
> 2.17.1
>
--
| Michael Nazzareno Trimarchi Amarula Solutions BV |
| COO - Founder Cruquiuskade 47 |
| +31(0)851119172 Amsterdam 1018 AM NL |
| [`as] http://www.amarulasolutions.com |
