diff options
| author | Simon Glass <sjg@chromium.org> | 2019-07-20 12:23:25 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-07-29 09:38:05 -0600 |
| commit | 935461262e322fce6fcfc48caf2b9a6ec05caaae (patch) | |
| tree | 311a4f7d2e2f4f9067720387c0814b9439fa30c5 /tools/binman | |
| parent | b88e81c622fd683f59498b03d34c88ce7fe68184 (diff) | |
| download | u-boot-935461262e322fce6fcfc48caf2b9a6ec05caaae.tar.gz u-boot-935461262e322fce6fcfc48caf2b9a6ec05caaae.tar.bz2 u-boot-935461262e322fce6fcfc48caf2b9a6ec05caaae.zip | |
binman: Move GetFdtSet() into blob_dtb
At present we check the filename to see if an entry holds a device-tree
file. It is easier to use the base class designed for this purpose.
Move this method implementation into Entry_blob_dtb and update the default
one to return an empty set.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
| -rw-r--r-- | tools/binman/entry.py | 5 | ||||
| -rw-r--r-- | tools/binman/etype/blob_dtb.py | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 1c382f3b85..276035ed32 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -192,11 +192,6 @@ class Entry(object): Set containing the filename from this entry, if it is a .dtb, else an empty set """ - fname = self.GetDefaultFilename() - # It would be better to use isinstance(self, Entry_blob_dtb) here but - # we cannot access Entry_blob_dtb - if fname and fname.endswith('.dtb'): - return set([fname]) return set() def ExpandEntries(self): diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py index 88ed55d886..b242c2da38 100644 --- a/tools/binman/etype/blob_dtb.py +++ b/tools/binman/etype/blob_dtb.py @@ -31,3 +31,12 @@ class Entry_blob_dtb(Entry_blob): _, indata = state.GetFdtContents(self._filename) data = self.CompressData(indata) return self.ProcessContentsUpdate(data) + + def GetFdtSet(self): + """Get the set of device trees used by this entry + + Returns: + Set containing the filename from this entry + """ + fname = self.GetDefaultFilename() + return set([fname]) |