dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-08 03:35:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

binman: Don't add compression attribute for uncompressed files

Browse Source 
cbfsutil changed to skip adding a compression attribute if there is no
compression. Adjust the binman implementation to do the same.

This mirrors commit 105cdf5625 in coreboot.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
This commit is contained in:
Simon Glass
2023-10-14 14:40:26 -06:00
committed by Tom Rini
parent 823f5c3a02
commit bd13255a91
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/binman/cbfs_util_test.py
View File

@@ -96,7 +96,7 @@ class TestCbfs(unittest.TestCase):
self.assertEqual(arch, cbfs.arch)
return cbfs
def _check_uboot(self, cbfs, ftype=cbfs_util.TYPE_RAW, offset=0x38,
def _check_uboot(self, cbfs, ftype=cbfs_util.TYPE_RAW, offset=0x28,
data=U_BOOT_DATA, cbfs_offset=None):
"""Check that the U-Boot file is as expected
@@ -122,7 +122,7 @@ class TestCbfs(unittest.TestCase):
self.assertEqual(len(data), cfile.memlen)
return cfile
def _check_dtb(self, cbfs, offset=0x38, data=U_BOOT_DTB_DATA,
def _check_dtb(self, cbfs, offset=0x28, data=U_BOOT_DTB_DATA,
cbfs_offset=None):
"""Check that the U-Boot dtb file is as expected
@@ -598,8 +598,8 @@ class TestCbfs(unittest.TestCase):
data = cbw.get_data()
cbfs = cbfs_util.CbfsReader(data)
self.assertEqual(0x38, cbfs.files['u-boot'].cbfs_offset)
self.assertEqual(0x78, cbfs.files['u-boot-dtb'].cbfs_offset)
self.assertEqual(0x28, cbfs.files['u-boot'].cbfs_offset)
self.assertEqual(0x68, cbfs.files['u-boot-dtb'].cbfs_offset)
if __name__ == '__main__':