Skip to content

Commit 59f18d8

Browse files
wensnathanchance
authored andcommitted
scripts/make_fit.py: Drop explicit LZMA parallel compression
Parallel compression for LZMA was added using the plzip tool. However plzip produces lzip format output, which is different from the raw LZMA format that the lzma tool produces. This causes depthcharge (the second stage bootloader on Chromebooks) to fail to load the payload. Drop the explicit LZMA parallel compression toolchain. If the lzma tool on the build machine is from xz-utils, then there's a chance parallel compression is already enabled. The xz-utils manpage says the following for the -T (threads) argument: Specify the number of worker threads to use. Setting threads to a special value 0 makes xz use up to as many threads as the processor(s) on the system support. The actual number of threads can be fewer than threads if the input file is not big enough for threading with the given settings or if using more threads would exceed the memory usage limit. [...] The default value for threads is 0. In xz 5.4.x and older the default is 1. Fixes: fcdcf22 ("scripts/make_fit: Support a few more parallel compressors") Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: Simon Glass <simon.glass@canonical.com> Link: https://patch.msgid.link/20260212074308.2189032-1-wenst@chromium.org Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent be55899 commit 59f18d8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

scripts/make_fit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
'bzip2': CompTool('.bz2', 'pbzip2,bzip2'),
5555
'gzip': CompTool('.gz', 'pigz,gzip'),
5656
'lz4': CompTool('.lz4', 'lz4'),
57-
'lzma': CompTool('.lzma', 'plzip,lzma'),
57+
'lzma': CompTool('.lzma', 'lzma'),
5858
'lzo': CompTool('.lzo', 'lzop'),
5959
'xz': CompTool('.xz', 'xz'),
6060
'zstd': CompTool('.zstd', 'zstd'),

0 commit comments

Comments
 (0)