Skip to content

Commit

Permalink
binman: btool: fiptool: use Bintool.version
Browse files Browse the repository at this point in the history
Bintool.version can now be passed the binary argument to return the
version text, so there's no need to override it in fiptool anymore.

Signed-off-by: Quentin Schulz <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
  • Loading branch information
QSchulz authored and sjg20 committed Sep 1, 2022
1 parent e440843 commit 4508fb9
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions tools/binman/btool/fiptool.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Bintoolfiptool(bintool.Bintool):
https://trustedfirmware-a.readthedocs.io/en/latest/getting_started/tools-build.html?highlight=fiptool#building-and-using-the-fip-tool
"""
def __init__(self, name):
super().__init__(name, 'Manipulate ATF FIP files')
super().__init__(name, 'Manipulate ATF FIP files', r'^(.*)$', 'version')

def info(self, fname):
"""Get info on a FIP image
Expand Down Expand Up @@ -112,12 +112,3 @@ def fetch(self, method):
'fiptool',
'tools/fiptool/fiptool')
return result

def version(self):
"""Version handler for fiptool
Returns:
str: Version number of fiptool
"""
out = self.run_cmd('version').strip()
return out or super().version()

0 comments on commit 4508fb9

Please sign in to comment.