binman: Rename ReadContents() to ReadBlobContents()

This function name is too generic for its purpose and is therefore
confusing. It actually only applies to blobs, so rename it to indicate
this.

Signed-off-by: Simon Glass <sjg@chromium.org>
lime2-spi
Simon Glass 6 years ago
parent 1be70d20d8
commit 7e7c587760
  1. 4
      tools/binman/etype/blob.py
  2. 2
      tools/binman/etype/u_boot_dtb_with_ucode.py
  3. 2
      tools/binman/etype/u_boot_ucode.py

@ -29,10 +29,10 @@ class Entry_blob(Entry):
def ObtainContents(self): def ObtainContents(self):
self._filename = self.GetDefaultFilename() self._filename = self.GetDefaultFilename()
self._pathname = tools.GetInputFilename(self._filename) self._pathname = tools.GetInputFilename(self._filename)
self.ReadContents() self.ReadBlobContents()
return True return True
def ReadContents(self): def ReadBlobContents(self):
with open(self._pathname) as fd: with open(self._pathname) as fd:
# We assume the data is small enough to fit into memory. If this # We assume the data is small enough to fit into memory. If this
# is used for large filesystem image that might not be true. # is used for large filesystem image that might not be true.

@ -71,7 +71,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob):
# Call the base class just in case it does something important. # Call the base class just in case it does something important.
Entry_blob.ObtainContents(self) Entry_blob.ObtainContents(self)
self._pathname = control.GetFdtPath(self._filename) self._pathname = control.GetFdtPath(self._filename)
self.ReadContents() self.ReadBlobContents()
if self.ucode: if self.ucode:
for node in self.ucode.subnodes: for node in self.ucode.subnodes:
data_prop = node.props.get('data') data_prop = node.props.get('data')

@ -92,6 +92,6 @@ class Entry_u_boot_ucode(Entry_blob):
fd.write(fdt_entry.ucode_data) fd.write(fdt_entry.ucode_data)
self._pathname = fname self._pathname = fname
self.ReadContents() self.ReadBlobContents()
return True return True

Loading…
Cancel
Save