binman: fix passing loadables to mkimage on first run
FIT use mkimage from BuildSectionData() to build FIT entry contents. BuildSectionData() get called several times during building FIT image. Currently when fit inserts loadables, it use self._loadables property that contain loadables computed during previuos BuildSectionData() invocation. So for the first run it use empty list and pass no loadables to mkimage. That makes problem for adding signature to FIT image because mkimage fails to add signature and aborts building FIT if no loadables provided. The patch fixes described behaviour in a way that BuildSectionData() uses recently calculated loadables value, not previosly calculated. Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:

committed by
Simon Glass

parent
aa0b3e6ef4
commit
7c4e5223cb
@@ -637,8 +637,8 @@ class Entry_fit(Entry_section):
|
||||
"""
|
||||
val = fdt_util.GetStringList(node, 'fit,firmware')
|
||||
if val is None:
|
||||
return None, self._loadables
|
||||
valid_entries = list(self._loadables)
|
||||
return None, loadables
|
||||
valid_entries = list(loadables)
|
||||
for name, entry in self.GetEntries().items():
|
||||
missing = []
|
||||
entry.CheckMissing(missing)
|
||||
@@ -653,7 +653,7 @@ class Entry_fit(Entry_section):
|
||||
firmware = name
|
||||
elif name not in result:
|
||||
result.append(name)
|
||||
for name in self._loadables:
|
||||
for name in loadables:
|
||||
if name != firmware and name not in result:
|
||||
result.append(name)
|
||||
return firmware, result
|
||||
|
Reference in New Issue
Block a user