Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 22:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

binman: cfbs: Refactor ObtainContents() for consistency

Browse source 
Update this to use the same arguments as entry_Section uses.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-11-23 11:03:53 -07:00
parent 3fc20fd805
commit 7413321a47
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
tools/binman/etype/cbfs.py
View file

@ -193,7 +193,24 @@ class Entry_cbfs(Entry):
(node.name, compress))
self._entries[entry._cbfs_name] = entry
def ObtainContents(self, skip=None):
def ObtainCfile(self, cbfs, entry):
# First get the input data and put it in a file. If not available,
# try later.
data = entry.GetData()
cfile = None
if entry._type == 'raw':
cfile = cbfs.add_file_raw(entry._cbfs_name, data,
entry._cbfs_offset,
entry._cbfs_compress)
elif entry._type == 'stage':
cfile = cbfs.add_file_stage(entry._cbfs_name, data,
entry._cbfs_offset)
else:
entry.Raise("Unknown cbfs-type '%s' (use 'raw', 'stage')" %
entry._type)
return cfile
def ObtainContents(self, skip_entry=None):
arch = cbfs_util.find_arch(self._cbfs_arg)
if arch is None:
self.Raise("Invalid architecture '%s'" % self._cbfs_arg)
@ -201,22 +218,9 @@ class Entry_cbfs(Entry):
self.Raise("'cbfs' entry must have a size property")
cbfs = CbfsWriter(self.size, arch)
for entry in self._entries.values():
# First get the input data and put it in a file. If not available,
# try later.
if entry != skip and not entry.ObtainContents():
if entry != skip_entry and not entry.ObtainContents():
return False
data = entry.GetData()
cfile = None
if entry._type == 'raw':
cfile = cbfs.add_file_raw(entry._cbfs_name, data,
entry._cbfs_offset,
entry._cbfs_compress)
elif entry._type == 'stage':
cfile = cbfs.add_file_stage(entry._cbfs_name, data,
entry._cbfs_offset)
else:
entry.Raise("Unknown cbfs-type '%s' (use 'raw', 'stage')" %
entry._type)
cfile = self.ObtainCfile(cbfs, entry)
if cfile:
entry._cbfs_file = cfile
data = cbfs.get_data()
@ -285,5 +289,7 @@ class Entry_cbfs(Entry):
return cfile.data if decomp else cfile.orig_data
def WriteChildData(self, child):
self.ObtainContents(skip=child)
# Recreate the data structure, leaving the data for this child alone,
# so that child.data is used to pack into the FIP.
self.ObtainContents(skip_entry=child)
return True