GZIP-compressed files end with 4 byte data that represents the size of the original input. The decompressors (the self-extracting kernel) exploit it to know the vmlinux size beforehand. To mimic the GZIP's trailer, Kbuild provides cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}. Unfortunately these macros are used everywhere despite the appended size data is only useful for the decompressors. There is no guarantee that such hand-crafted trailers are safely ignored. In fact, the kernel refuses compressed initramdfs with the garbage data. That is why usr/Makefile overrides size_append to make it no-op. To limit the use of such broken compressed files, this commit renames the existing macros as follows: cmd_bzip2 --> cmd_bzip2_with_size cmd_lzma --> cmd_lzma_with_size cmd_lzo --> cmd_lzo_with_size cmd_lz4 --> cmd_lz4_with_size cmd_xzkern --> cmd_xzkern_with_size cmd_zstd22 --> cmd_zstd22_with_size To keep the decompressors working, I updated the following Makefiles accordingly: arch/arm/boot/compressed/Makefile arch/h8300/boot/compressed/Makefile arch/mips/boot/compressed/Makefile arch/parisc/boot/compressed/Makefile arch/s390/boot/compressed/Makefile arch/sh/boot/compressed/Makefile arch/x86/boot/compressed/Makefile I reused the current macro names for the normal usecases; they produce the compressed data in the proper format. I did not touch the following: arch/arc/boot/Makefile arch/arm64/boot/Makefile arch/csky/boot/Makefile arch/mips/boot/Makefile arch/riscv/boot/Makefile arch/sh/boot/Makefile kernel/Makefile This means those Makefiles will stop appending the size data. I dropped the 'override size_append' hack from usr/Makefile. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <n.schier@avm.de>
45 lines
1.4 KiB
Makefile
45 lines
1.4 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# linux/arch/sh/boot/compressed/Makefile
|
|
#
|
|
# create a compressed vmlinux image from the original vmlinux
|
|
#
|
|
|
|
targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
|
|
|
|
OBJECTS = $(obj)/head.o $(obj)/misc.o
|
|
|
|
#
|
|
# IMAGE_OFFSET is the load offset of the compression loader
|
|
# Assign dummy values if these 2 variables are not defined,
|
|
# in order to suppress error message.
|
|
#
|
|
CONFIG_MEMORY_START ?= 0x00400000
|
|
CONFIG_BOOT_LINK_OFFSET ?= 0x00280000
|
|
IMAGE_OFFSET := $(shell printf "0x%08x" $$(($(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET))))
|
|
|
|
LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name 2>/dev/null)
|
|
LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup -T $(obj)/vmlinux.lds \
|
|
--defsym output=$(CONFIG_MEMORY_START)
|
|
|
|
$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE
|
|
$(call if_changed,ld)
|
|
|
|
$(obj)/vmlinux.bin: vmlinux FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
suffix-$(CONFIG_KERNEL_GZIP) := gzip
|
|
suffix-$(CONFIG_KERNEL_LZO) := lzo
|
|
compress-$(CONFIG_KERNEL_GZIP) := gzip
|
|
compress-$(CONFIG_KERNEL_LZO) := lzo_with_size
|
|
|
|
$(obj)/vmlinux.bin.$(suffix-y): $(obj)/vmlinux.bin FORCE
|
|
$(call if_changed,$(compress-y))
|
|
|
|
LDFLAGS_piggy.o := -r --format binary --oformat elf32-h8300-linux -T
|
|
OBJCOPYFLAGS := -O binary
|
|
|
|
$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE
|
|
$(call if_changed,ld)
|
|
|
|
CFLAGS_misc.o = -O0
|