dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

binman: Remember the pre-reset entry size

Browse Source 
When preparing to possible expand or contract an entry we reset the size
to the original value from the binman device-tree definition, which is
often None.

This causes binman to forget the original size of the entry. Remember this
so that it can be used when needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2019-10-31 07:43:02 -06:00
parent 97de532e59
commit 9a5d3dcff7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/binman/entry.py
View File

@@ -47,6 +47,8 @@ class Entry(object):
offset: Offset of entry within the section, None if not known yet (in offset: Offset of entry within the section, None if not known yet (in
which case it will be calculated by Pack()) which case it will be calculated by Pack())
size: Entry size in bytes, None if not known size: Entry size in bytes, None if not known
pre_reset_size: size as it was before ResetForPack(). This allows us to
keep track of the size we started with and detect size changes
uncomp_size: Size of uncompressed data in bytes, if the entry is uncomp_size: Size of uncompressed data in bytes, if the entry is
compressed, else None compressed, else None
contents_size: Size of contents in bytes, 0 by default contents_size: Size of contents in bytes, 0 by default
@@ -71,6 +73,7 @@ class Entry(object):
self.name = node and (name_prefix + node.name) or 'none' self.name = node and (name_prefix + node.name) or 'none'
self.offset = None self.offset = None
self.size = None self.size = None
self.pre_reset_size = None
self.uncomp_size = None self.uncomp_size = None
self.data = None self.data = None
self.contents_size = 0 self.contents_size = 0
@@ -314,6 +317,7 @@ class Entry(object):
self.Detail('ResetForPack: offset %s->%s, size %s->%s' % self.Detail('ResetForPack: offset %s->%s, size %s->%s' %
(ToHex(self.offset), ToHex(self.orig_offset), (ToHex(self.offset), ToHex(self.orig_offset),
ToHex(self.size), ToHex(self.orig_size))) ToHex(self.size), ToHex(self.orig_size)))
self.pre_reset_size = self.size
self.offset = self.orig_offset self.offset = self.orig_offset
self.size = self.orig_size self.size = self.orig_size
@@ -757,7 +761,10 @@ features to produce new behaviours.
True if the data did not result in a resize of this entry, False if True if the data did not result in a resize of this entry, False if
the entry must be resized the entry must be resized
""" """
self.contents_size = self.size if self.size is not None:
self.contents_size = self.size
else:
self.contents_size = self.pre_reset_size
ok = self.ProcessContentsUpdate(data) ok = self.ProcessContentsUpdate(data)
self.Detail('WriteData: size=%x, ok=%s' % (len(data), ok)) self.Detail('WriteData: size=%x, ok=%s' % (len(data), ok))
section_ok = self.section.WriteChildData(self) section_ok = self.section.WriteChildData(self)