[U-Boot,v5,05/15] spl: fit: Do not fail immediately if an overlay is not available
diff mbox series

Message ID 20190920152824.18958-6-jjhiblot@ti.com
State Superseded
Delegated to: Tom Rini
Headers show
Series
  • Add support for applications of overlays in SPL
Related show

Commit Message

Jean-Jacques Hiblot Sept. 20, 2019, 3:28 p.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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

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

Patch
diff mbox series

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 4fdc10c9e2..187dd5ab3f 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -324,9 +324,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__);
 				break;
+			} else if (node < 0) {
+				debug("%s: unable to find FDT node %d\n",
+				      __func__, index);
+				continue;
 			}
 
 			if (!tmpbuffer) {