From b26536ad3d940d64a070d7c2d0ecb0f28bad8289 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Wed, 21 Oct 2020 21:12:09 -0500 Subject: [PATCH] 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 Signed-off-by: Samuel Holland Reviewed-by: Jagan Teki --- tools/binman/etype/fit.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: -- 2.39.5