diff options
| author | Simon Glass <sjg@chromium.org> | 2018-07-17 13:25:50 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-08-01 16:30:48 -0600 |
| commit | 7e7c587760ca42f47d9a3b6869f39f7c309f50e1 (patch) | |
| tree | 341ab96564d12482368ec623d2766f951b7ef324 /tools/binman/etype | |
| parent | 1be70d20d8466c287cd1dc6f590171794ba67f07 (diff) | |
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/etype')
| -rw-r--r-- | tools/binman/etype/blob.py | 4 | ||||
| -rw-r--r-- | tools/binman/etype/u_boot_dtb_with_ucode.py | 2 | ||||
| -rw-r--r-- | tools/binman/etype/u_boot_ucode.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py index 692d8683c3..3f46eecf30 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 adcb898a7b..285a28dd1e 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 0f1761afc8..6acf94d8cb 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 |