diff options
| author | Tom Rini <[email protected]> | 2024-08-05 12:15:44 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-08-05 12:17:02 -0600 |
| commit | 9efc554db8a6ab6e0c68d0f05fc273e5fb494e4e (patch) | |
| tree | 0f22cb5696bdc743d805c77ae3fc7d5c54bab1c4 /tools/binman | |
| parent | 6becf9ba1ab82af6f4fcf9f4d0da38f9c75212d2 (diff) | |
| parent | d63091137c8da5e1f3367c40ec607cd8918b8780 (diff) | |
Merge patch series "Bug-fixes for a few boards"
Simon Glass <[email protected]> says:
This series includes fixes to get some rockchip and nvidia boards
working again. It also drops the broken Beaglebone Black config and
provides a devicetree fix for coral (x86).
Diffstat (limited to 'tools/binman')
| -rw-r--r-- | tools/binman/btool/mkeficapsule.py | 3 | ||||
| -rw-r--r-- | tools/binman/etype/efi_capsule.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/binman/btool/mkeficapsule.py b/tools/binman/btool/mkeficapsule.py index ef1da638df1..f7e5a886849 100644 --- a/tools/binman/btool/mkeficapsule.py +++ b/tools/binman/btool/mkeficapsule.py @@ -33,7 +33,8 @@ class Bintoolmkeficapsule(bintool.Bintool): commandline, or through a config file. """ def __init__(self, name): - super().__init__(name, 'mkeficapsule tool for generating capsules') + super().__init__(name, 'mkeficapsule tool for generating capsules', + r'mkeficapsule version (.*)') def generate_capsule(self, image_index, image_guid, hardware_instance, payload, output_fname, priv_key, pub_key, diff --git a/tools/binman/etype/efi_capsule.py b/tools/binman/etype/efi_capsule.py index 751f654bf31..5941545d0b2 100644 --- a/tools/binman/etype/efi_capsule.py +++ b/tools/binman/etype/efi_capsule.py @@ -148,8 +148,11 @@ class Entry_efi_capsule(Entry_section): self.fw_version, self.oem_flags) if ret is not None: - os.remove(payload) return tools.read_file(capsule_fname) + else: + # Bintool is missing; just use the input data as the output + self.record_missing_bintool(self.mkeficapsule) + return data def AddBintools(self, btools): self.mkeficapsule = self.AddBintool(btools, 'mkeficapsule') |