From 408e2d5a224d8c62beae4cb1e7a3804abbbb123f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Carretero?= Date: Wed, 16 Mar 2022 15:35:36 -0400 Subject: [PATCH] boot: image: fixup zstd decompression buffer initialization typo The code was mistakenly initializing the input buffer twice. Tested to be working on BeagleBone by adjusting CONFIG_SYS_BOOTM_LEN to 64MiB (probably works with less) and preparing uImage with: cat arch/arm/boot/Image \ | zstd --ultra -22 --zstd=windowLog=22 \ > linux.bin.zst mkimage -A arm -T kernel uImage -C zstd -d linux.bin.zst \ -a 0x80008000 -e 0x80008000 Without the windowLog restriction, bootm fails with a zstd decompression error 7 (window too large), which I haven't troubleshooted. There should be a bit more documentation on the feature... Reviewed-by: Simon Glass Fixes: 458b30af66c image: Update image_decomp() to avoid ifdefs --- boot/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/image.c b/boot/image.c index 07fa2d3160..121df0c838 100644 --- a/boot/image.c +++ b/boot/image.c @@ -500,7 +500,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, struct abuf in, out; abuf_init_set(&in, image_buf, image_len); - abuf_init_set(&in, load_buf, unc_len); + abuf_init_set(&out, load_buf, unc_len); ret = zstd_decompress(&in, &out); if (ret >= 0) { image_len = ret; -- 2.39.5