diff mbox series

[U-Boot,v3,04/12] spl: fit: Do not fail immediately if an overlay is not available

Message ID 20190523103912.3790-5-jjhiblot@ti.com
State Superseded
Delegated to: Tom Rini
Headers show
Series Add support for applications of overlays in SPL | expand

Commit Message

Jean-Jacques Hiblot May 23, 2019, 10:39 a.m. UTC
If one overlay that must be applied cannot be found in the FIT, the current
implementation stops applying the overlays. Let's make it skip only the
failing overlay instead.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---

Changes in v3: None
Changes in v2: None

 common/spl/spl_fit.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Simon Glass June 22, 2019, 7:09 p.m. UTC | #1
On Thu, 23 May 2019 at 11:39, Jean-Jacques Hiblot <jjhiblot@ti.com> wrote:
>
> If one overlay that must be applied cannot be found in the FIT, the current
> implementation stops applying the overlays. Let's make it skip only the
> failing overlay instead.
>
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
>  common/spl/spl_fit.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index b521ee68e6..d5e3858ed0 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -315,9 +315,13 @@  static int spl_fit_append_fdt(struct spl_image_info *spl_image,
 
 	for (; ; index++) {
 		node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, index);
-		if (node < 0) {
+		if (node == -E2BIG) {
 			debug("%s: No additional FDT node\n", __func__);
 			return 0;
+		} else if (node < 0) {
+			debug("%s: unable to find FDT node %d\n", __func__,
+			      index);
+			continue;
 		}
 
 		image_info.load_addr = (ulong)tmpbuffer;