diff options
| author | Simon Glass <sjg@chromium.org> | 2019-07-20 21:24:06 +0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-07-29 18:38:06 +0300 |
| commit | eb0f4a4cb40264a90a91e10e3ec00d1e0da7fb66 (patch) | |
| tree | d317dd48088c9c20af20e1e85e4890640cedfd0d /tools/binman/control.py | |
| parent | 7210c89eac7fb68947f5f31372d9f1e93f42df0c (diff) | |
| download | u-boot-eb0f4a4cb40264a90a91e10e3ec00d1e0da7fb66.tar.xz | |
binman: Support replacing data in a cbfs
At present binman cannot replace data within a CBFS since it does not
allow rewriting of the files in that CBFS. Implement this by using the
new WriteData() method to handle the case.
Add a header to compressed data so that the amount of compressed data can
be determined without reference to the size of the containing entry. This
allows the entry to be larger that the contents, without causing errors in
decompression. This is necessary to cope with a compressed device tree
being updated in such a way that it shrinks after the entry size is
already set (an obscure case). It is not used with CBFS since it has its
own metadata for this. Increase the number of passes allowed to resolve
the position of entries, to handle this case.
Add a test for this new logic.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman/control.py')
| -rw-r--r-- | tools/binman/control.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/binman/control.py b/tools/binman/control.py index 22e3e306e5..9c8bc6253f 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -311,7 +311,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, # since changing an offset from 0x100 to 0x104 (for example) can # alter the compressed size of the device tree. So we need a # third pass for this. - passes = 3 + passes = 5 for pack_pass in range(passes): try: image.PackEntries() |