diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-27 13:38:27 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-06-02 16:18:20 (GMT) |
| commit | 515d3f08017d2f67fd2e400babadb2c192c5c055 (patch) | |
| tree | e404ecd8ba5f6c6fe156ca5631e1379055cbca45 /tools/binman | |
| parent | 160a7664252c937d57caf9bc588519ede6e46a34 (diff) | |
| download | u-boot-515d3f08017d2f67fd2e400babadb2c192c5c055.tar.xz | |
binman: Drop a special case related to fdt_fallback
Previously we were sometimes forced to collate x86 microcode due to not
having access to the offset of each individual piece. Now that we never
use fdt_fallback, we don't have this problem. Drop this special case from
the code.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
| -rw-r--r-- | tools/binman/etype/u_boot_dtb_with_ucode.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py b/tools/binman/etype/u_boot_dtb_with_ucode.py index fc02c67..95405c6 100644 --- a/tools/binman/etype/u_boot_dtb_with_ucode.py +++ b/tools/binman/etype/u_boot_dtb_with_ucode.py @@ -57,17 +57,12 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob): data_prop = node.props.get('data') if data_prop: self.ucode_data += ''.join(data_prop.bytes) - if not self.collate: - poffset = data_prop.GetOffset() - if poffset is None: - # We cannot obtain a property offset. Collate instead. - self.collate = True - else: - # Find the offset in the device tree of the ucode data - self.ucode_offset = poffset + 12 - self.ucode_size = len(data_prop.bytes) if self.collate: prop = node.DeleteProp('data') + else: + # Find the offset in the device tree of the ucode data + self.ucode_offset = data_prop.GetOffset() + 12 + self.ucode_size = len(data_prop.bytes) if self.collate: fdt.Pack() fdt.Flush() |