aboutsummaryrefslogtreecommitdiff
path: root/tools/binman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2018-07-17 13:25:50 -0600
committerSimon Glass <sjg@chromium.org>2018-08-01 16:30:48 -0600
commit7e7c587760ca42f47d9a3b6869f39f7c309f50e1 (patch)
tree341ab96564d12482368ec623d2766f951b7ef324 /tools/binman
parent1be70d20d8466c287cd1dc6f590171794ba67f07 (diff)
downloadu-boot-7e7c587760ca42f47d9a3b6869f39f7c309f50e1.zip
u-boot-7e7c587760ca42f47d9a3b6869f39f7c309f50e1.tar.gz
u-boot-7e7c587760ca42f47d9a3b6869f39f7c309f50e1.tar.bz2
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>
Diffstat (limited to 'tools/binman')
-rw-r--r--tools/binman/etype/blob.py4
-rw-r--r--tools/binman/etype/u_boot_dtb_with_ucode.py2
-rw-r--r--tools/binman/etype/u_boot_ucode.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py
index 692d868..3f46eec 100644
--- a/tools/binman/etype/blob.py
+++ b/tools/binman/etype/blob.py
@@ -29,10 +29,10 @@ class Entry_blob(Entry):
def ObtainContents(self):
self._filename = self.GetDefaultFilename()
self._pathname = tools.GetInputFilename(self._filename)
- self.ReadContents()
+ self.ReadBlobContents()
return True
- def ReadContents(self):
+ def ReadBlobContents(self):
with open(self._pathname) as fd:
# We assume the data is small enough to fit into memory. If this
# is used for large filesystem image that might not be true.
diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py b/tools/binman/etype/u_boot_dtb_with_ucode.py
index adcb898..285a28d 100644
--- a/tools/binman/etype/u_boot_dtb_with_ucode.py
+++ b/tools/binman/etype/u_boot_dtb_with_ucode.py
@@ -71,7 +71,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob):
# Call the base class just in case it does something important.
Entry_blob.ObtainContents(self)
self._pathname = control.GetFdtPath(self._filename)
- self.ReadContents()
+ self.ReadBlobContents()
if self.ucode:
for node in self.ucode.subnodes:
data_prop = node.props.get('data')
diff --git a/tools/binman/etype/u_boot_ucode.py b/tools/binman/etype/u_boot_ucode.py
index 0f1761a..6acf94d 100644
--- a/tools/binman/etype/u_boot_ucode.py
+++ b/tools/binman/etype/u_boot_ucode.py
@@ -92,6 +92,6 @@ class Entry_u_boot_ucode(Entry_blob):
fd.write(fdt_entry.ucode_data)
self._pathname = fname
- self.ReadContents()
+ self.ReadBlobContents()
return True