diff options
Diffstat (limited to 'tools/binman/etype/intel_ifwi.py')
-rw-r--r-- | tools/binman/etype/intel_ifwi.py | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/tools/binman/etype/intel_ifwi.py b/tools/binman/etype/intel_ifwi.py index 76b3357c25..6a96f6be55 100644 --- a/tools/binman/etype/intel_ifwi.py +++ b/tools/binman/etype/intel_ifwi.py @@ -8,11 +8,11 @@ from collections import OrderedDict from binman.entry import Entry -from binman.etype.blob_ext import Entry_blob_ext +from binman.etype.blob import Entry_blob from dtoc import fdt_util from patman import tools -class Entry_intel_ifwi(Entry_blob_ext): +class Entry_intel_ifwi(Entry_blob): """Entry containing an Intel Integrated Firmware Image (IFWI) file Properties / Entry arguments: @@ -45,13 +45,13 @@ class Entry_intel_ifwi(Entry_blob_ext): See README.x86 for information about x86 binary blobs. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + Entry_blob.__init__(self, section, etype, node) self._convert_fit = fdt_util.GetBool(self._node, 'convert-fit') self._ifwi_entries = OrderedDict() def ReadNode(self): self._ReadSubnodes() - super().ReadNode() + Entry_blob.ReadNode(self) def _BuildIfwi(self): """Build the contents of the IFWI and write it to the 'data' property""" @@ -84,7 +84,7 @@ class Entry_intel_ifwi(Entry_blob_ext): return True def ObtainContents(self): - """Get the contents for the IFWI + """Get the contects for the IFWI Unfortunately we cannot create anything from scratch here, as Intel has tools which create precursor binaries with lots of data and settings, @@ -97,21 +97,13 @@ class Entry_intel_ifwi(Entry_blob_ext): After that we delete the OBBP sub-partition and add each of the files that we want in the IFWI file, one for each sub-entry of the IWFI node. """ - self._pathname = tools.GetInputFilename(self._filename, - self.section.GetAllowMissing()) - # Allow the file to be missing - if not self._pathname: - self.SetContents(b'') - self.missing = True - return True + self._pathname = tools.GetInputFilename(self._filename) for entry in self._ifwi_entries.values(): if not entry.ObtainContents(): return False return self._BuildIfwi() def ProcessContents(self): - if self.missing: - return True orig_data = self.data self._BuildIfwi() same = orig_data == self.data @@ -129,6 +121,5 @@ class Entry_intel_ifwi(Entry_blob_ext): def WriteSymbols(self, section): """Write symbol values into binary files for access at run time""" - if not self.missing: - for entry in self._ifwi_entries.values(): - entry.WriteSymbols(self) + for entry in self._ifwi_entries.values(): + entry.WriteSymbols(self) |