Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-16 23:07:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

binman: Disable compressed data header

Browse source 
Disable the compressed data header of the utilities to compress and
decompress data. The header is uncommon, not supported by U-Boot and
incompatible with external compressed artifacts.

The header was introduced as part of commit eb0f4a4cb4 ("binman:
Support replacing data in a cbfs") to allow device tree entries to be
larger than the compressed contents.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Stefan Herbrechtsmeier 2022-08-19 16:25:26 +02:00 • committed by Simon Glass
parent 6aa8000e74
commit 9f74395ee5
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/binman/entry.py
View file

@ -1117,7 +1117,7 @@ features to produce new behaviours.
self.uncomp_data = indata
if self.compress != 'none':
self.uncomp_size = len(indata)
data = comp_util.compress(indata, self.compress)
data = comp_util.compress(indata, self.compress, with_header=False)
return data
def DecompressData(self, indata):
@ -1129,7 +1129,7 @@ features to produce new behaviours.
Returns:
Decompressed data
"""
data = comp_util.decompress(indata, self.compress)
data = comp_util.decompress(indata, self.compress, with_header=False)
if self.compress != 'none':
self.uncomp_size = len(data)
self.uncomp_data = data

12
tools/binman/ftest.py
View file

@ -1967,7 +1967,7 @@ class TestFunctional(unittest.TestCase):
self._ResetDtbs()
def _decompress(self, data):
return comp_util.decompress(data, 'lz4')
return comp_util.decompress(data, 'lz4', with_header=False)
def testCompress(self):
"""Test compression of blobs"""
@ -4427,14 +4427,16 @@ class TestFunctional(unittest.TestCase):
rest = base[len(U_BOOT_DATA):]
# Check compressed data
expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4')
expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4',
with_header=False)
data1 = rest[:len(expect1)]
section1 = self._decompress(data1)
self.assertEquals(expect1, data1)
self.assertEquals(COMPRESS_DATA + U_BOOT_DATA, section1)
rest1 = rest[len(expect1):]
expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4')
expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4',
with_header=False)
data2 = rest1[:len(expect2)]
section2 = self._decompress(data2)
self.assertEquals(expect2, data2)
@ -5219,11 +5221,11 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testInvalidCompress(self):
with self.assertRaises(ValueError) as e:
comp_util.compress(b'', 'invalid')
comp_util.compress(b'', 'invalid', with_header=False)
self.assertIn("Unknown algorithm 'invalid'", str(e.exception))
with self.assertRaises(ValueError) as e:
comp_util.decompress(b'1234', 'invalid')
comp_util.decompress(b'1234', 'invalid', with_header=False)
self.assertIn("Unknown algorithm 'invalid'", str(e.exception))
def testBintoolDocs(self):