From: Samuel Holland <samuel@sholland.org>
Date: Thu, 22 Oct 2020 02:12:09 +0000 (-0500)
Subject: binman: Only write FDT once per node
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=b26536ad3d940d64a070d7c2d0ecb0f28bad8289;p=u-boot.git

binman: Only write FDT once per node

Due to an extra level of indentation, the "data" property containing the
FDT was being written repeatedly after every other property in the node.
This caused the generated FIT image to be invalid.

Move the block up one level, so the property is added exactly once.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
---

diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py
index de4745c552..8a24f12aa5 100644
--- a/tools/binman/etype/fit.py
+++ b/tools/binman/etype/fit.py
@@ -205,10 +205,10 @@ class Entry_fit(Entry):
                                         b'SEQ', tools.ToBytes(str(seq + 1)))
                                     fsw.property(pname, val)
 
-                                    # Add data for 'fdt' nodes (but not 'config')
-                                    if depth == 1 and in_images:
-                                        fsw.property('data',
-                                                     tools.ReadFile(fname))
+                                # Add data for 'fdt' nodes (but not 'config')
+                                if depth == 1 and in_images:
+                                    fsw.property('data',
+                                                 tools.ReadFile(fname))
                     else:
                         if self._fdts is None:
                             if self._fit_list_prop: