tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

riscv: boot: add Image.xz support

The Image.* targets existed for other compressors already. Bootloader
support is needed for decompression.

This is for CONFIG_EFI_ZBOOT=n. With CONFIG_EFI_ZBOOT=y, XZ was already
available.

Comparision with Linux 6.10 RV64GC tinyconfig (in KiB):

1027 Image
594 Image.gz
541 Image.zst
510 Image.lzma
474 Image.xz

Link: https://lkml.kernel.org/r/20240721133633.47721-17-lasse.collin@tukaani.org
Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Jules Maselbas <jmaselbas@zdiv.net>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Jubin Zhong <zhongjubin@huawei.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Rui Li <me@lirui.org>
Cc: Sam James <sam@gentoo.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Lasse Collin and committed by
Andrew Morton ab4ce983 181e71f6

+8 -2
+1
arch/riscv/Kconfig
··· 156 156 select HAVE_KERNEL_LZO if !XIP_KERNEL && !EFI_ZBOOT 157 157 select HAVE_KERNEL_UNCOMPRESSED if !XIP_KERNEL && !EFI_ZBOOT 158 158 select HAVE_KERNEL_ZSTD if !XIP_KERNEL && !EFI_ZBOOT 159 + select HAVE_KERNEL_XZ if !XIP_KERNEL && !EFI_ZBOOT 159 160 select HAVE_KPROBES if !XIP_KERNEL 160 161 select HAVE_KRETPROBES if !XIP_KERNEL 161 162 # https://github.com/ClangBuiltLinux/linux/issues/1881
+4 -2
arch/riscv/Makefile
··· 159 159 boot-image-$(CONFIG_KERNEL_LZMA) := Image.lzma 160 160 boot-image-$(CONFIG_KERNEL_LZO) := Image.lzo 161 161 boot-image-$(CONFIG_KERNEL_ZSTD) := Image.zst 162 + boot-image-$(CONFIG_KERNEL_XZ) := Image.xz 162 163 ifdef CONFIG_RISCV_M_MODE 163 164 boot-image-$(CONFIG_ARCH_CANAAN) := loader.bin 164 165 endif ··· 184 183 vdso-install-y += arch/riscv/kernel/vdso/vdso.so.dbg 185 184 vdso-install-$(CONFIG_COMPAT) += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg 186 185 187 - BOOT_TARGETS := Image Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst loader loader.bin xipImage vmlinuz.efi 186 + BOOT_TARGETS := Image Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loader loader.bin xipImage vmlinuz.efi 188 187 189 188 all: $(notdir $(KBUILD_IMAGE)) 190 189 191 190 loader.bin: loader 192 - Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst loader xipImage vmlinuz.efi: Image 191 + Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loader xipImage vmlinuz.efi: Image 193 192 194 193 $(BOOT_TARGETS): vmlinux 195 194 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ ··· 226 225 echo ' Image.lzma - Compressed kernel image (arch/riscv/boot/Image.lzma)' 227 226 echo ' Image.lzo - Compressed kernel image (arch/riscv/boot/Image.lzo)' 228 227 echo ' Image.zst - Compressed kernel image (arch/riscv/boot/Image.zst)' 228 + echo ' Image.xz - Compressed kernel image (arch/riscv/boot/Image.xz)' 229 229 echo ' vmlinuz.efi - Compressed EFI kernel image (arch/riscv/boot/vmlinuz.efi)' 230 230 echo ' Default when CONFIG_EFI_ZBOOT=y' 231 231 echo ' xipImage - Execute-in-place kernel image (arch/riscv/boot/xipImage)'
+3
arch/riscv/boot/Makefile
··· 64 64 $(obj)/Image.zst: $(obj)/Image FORCE 65 65 $(call if_changed,zstd) 66 66 67 + $(obj)/Image.xz: $(obj)/Image FORCE 68 + $(call if_changed,xzkern) 69 + 67 70 $(obj)/loader.bin: $(obj)/loader FORCE 68 71 $(call if_changed,objcopy) 69 72