binman: Correct Chromium OS entry types

The conversion to bintools broke the invocation of the utility, since
the arguments are not correct. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/binman/btool/futility.py b/tools/binman/btool/futility.py
index 614daaa..8d00966 100644 (file)
--- a/tools/binman/btool/futility.py
+++ b/tools/binman/btool/futility.py
@@ -106,7 +106,7 @@ class Bintoolfutility(bintool.Bintool):
         Returns:
             str: Tool output
         """
-        args = ['gbb_utility'
+        args = ['gbb_utility',
             '-s',
             f'--hwid={hwid}',
             f'--rootkey={rootkey}',
@@ -139,7 +139,7 @@ class Bintoolfutility(bintool.Bintool):
             '--keyblock', keyblock,
             '--signprivate', signprivate,
             '--version', version,
-            '--fw', firmware,
+            '--fv', firmware,
             '--kernelkey', kernelkey,
             '--flags', flags
             ]

diff --git a/tools/binman/etype/vblock.py b/tools/binman/etype/vblock.py
index 065b6ed..c3ef08b 100644 (file)
--- a/tools/binman/etype/vblock.py
+++ b/tools/binman/etype/vblock.py
@@ -73,7 +73,7 @@ class Entry_vblock(Entry_collection):
             vblock=output_fname,
             keyblock=prefix + self.keyblock,
             signprivate=prefix + self.signprivate,
-            version=f'{self.version,}',
+            version=f'{self.version:d}',
             firmware=input_fname,
             kernelkey=prefix + self.kernelkey,
             flags=f'{self.preamble_flags}')