Commit edd4a866 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/boot: get rid of startup archive 



The final kernel image is created by linking decompressor object files with
a startup archive. The startup archive file however does not contain only
optional code and data which can be discarded if not referenced. It also
contains mandatory object data like head.o which must never be discarded,
even if not referenced.

Move the decompresser code and linker script to the boot directory and get
rid of the startup archive so everything is kept during link time.

Acked-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 964bc5db

arch/s390/boot/.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -2,3 +2,6 @@ 
image

bzImage

section_cmp.*

vmlinux

vmlinux.lds

vmlinux.syms

arch/s390/boot/Makefile

+68 −8
Original line number Diff line number Diff line
@@ -41,10 +41,17 @@ obj-y += version.o pgm_check_info.o ctype.o 
obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE))	+= uv.o

obj-$(CONFIG_RELOCATABLE)	+= machine_kexec_reloc.o

obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o

targets	:= bzImage startup.a section_cmp.boot.data section_cmp.boot.preserved.data $(obj-y)

subdir-	:= compressed

obj-y	+= $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o

obj-all := $(obj-y) piggy.o syms.o



targets	:= bzImage section_cmp.boot.data section_cmp.boot.preserved.data $(obj-y)

targets	+= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2

targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4

targets += vmlinux.bin.zst info.bin syms.bin vmlinux.syms $(obj-all)



OBJECTS := $(addprefix $(obj)/,$(obj-y))

OBJECTS_ALL := $(addprefix $(obj)/,$(obj-all))



quiet_cmd_section_cmp = SECTCMP $*

define cmd_section_cmp
@@ -59,14 +66,67 @@ define cmd_section_cmp 
	touch $@

endef



$(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE

$(obj)/bzImage: $(obj)/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE

	$(call if_changed,objcopy)



$(obj)/section_cmp%: vmlinux $(obj)/compressed/vmlinux FORCE

$(obj)/section_cmp%: vmlinux $(obj)/vmlinux FORCE

	$(call if_changed,section_cmp)



$(obj)/compressed/vmlinux: $(obj)/startup.a FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@

LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup --build-id=sha1 -T

$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS_ALL) FORCE

	$(call if_changed,ld)



LDFLAGS_vmlinux.syms := --oformat $(LD_BFD) -e startup -T

$(obj)/vmlinux.syms: $(obj)/vmlinux.lds $(OBJECTS) FORCE

	$(call if_changed,ld)



quiet_cmd_dumpsyms = DUMPSYMS $<

define cmd_dumpsyms

	$(NM) -n -S --format=bsd "$<" | sed -nE 's/^0*([0-9a-fA-F]+) 0*([0-9a-fA-F]+) [tT] ([^ ]*)$$/\1 \2 \3/p' | tr '\n' '\0' > "$@"

endef



$(obj)/syms.bin: $(obj)/vmlinux.syms FORCE

	$(call if_changed,dumpsyms)



OBJCOPYFLAGS_syms.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.decompressor.syms

$(obj)/syms.o: $(obj)/syms.bin FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_info.bin := -O binary --only-section=.vmlinux.info --set-section-flags .vmlinux.info=load

$(obj)/info.bin: vmlinux FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_info.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.info

$(obj)/info.o: $(obj)/info.bin FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_vmlinux.bin := -O binary --remove-section=.comment --remove-section=.vmlinux.info -S

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



suffix-$(CONFIG_KERNEL_GZIP)  := .gz

suffix-$(CONFIG_KERNEL_BZIP2) := .bz2

suffix-$(CONFIG_KERNEL_LZ4)  := .lz4

suffix-$(CONFIG_KERNEL_LZMA)  := .lzma

suffix-$(CONFIG_KERNEL_LZO)  := .lzo

suffix-$(CONFIG_KERNEL_XZ)  := .xz

suffix-$(CONFIG_KERNEL_ZSTD)  := .zst



$(obj)/startup.a: $(OBJECTS) FORCE

	$(call if_changed,ar)
 
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)

$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE

	$(call if_changed,bzip2_with_size)

$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lz4_with_size)

$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzma_with_size)

$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzo_with_size)

$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,xzkern_with_size)

$(obj)/vmlinux.bin.zst: $(obj)/vmlinux.bin FORCE

	$(call if_changed,zstd22_with_size)



OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed

$(obj)/piggy.o: $(obj)/vmlinux.bin$(suffix-y) FORCE

	$(call if_changed,objcopy)

arch/s390/boot/compressed/.gitignore

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

vmlinux

vmlinux.lds

vmlinux.syms

arch/s390/boot/compressed/Makefile

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# linux/arch/s390/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



KCOV_INSTRUMENT := n

GCOV_PROFILE := n

UBSAN_SANITIZE := n

KASAN_SANITIZE := n

KCSAN_SANITIZE := n



obj-y	:= $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o

obj-all := $(obj-y) piggy.o syms.o

targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2

targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4

targets += vmlinux.bin.zst

targets += info.bin syms.bin vmlinux.syms $(obj-all)



KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)

KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)

OBJCOPYFLAGS :=



OBJECTS := $(addprefix $(obj)/,$(obj-y))

OBJECTS_ALL := $(addprefix $(obj)/,$(obj-all))



LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup --build-id=sha1 -T

$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS_ALL) FORCE

	$(call if_changed,ld)



LDFLAGS_vmlinux.syms := --oformat $(LD_BFD) -e startup -T

$(obj)/vmlinux.syms: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS) FORCE

	$(call if_changed,ld)



quiet_cmd_dumpsyms = DUMPSYMS $<

define cmd_dumpsyms

	$(NM) -n -S --format=bsd "$<" | sed -nE 's/^0*([0-9a-fA-F]+) 0*([0-9a-fA-F]+) [tT] ([^ ]*)$$/\1 \2 \3/p' | tr '\n' '\0' > "$@"

endef



$(obj)/syms.bin: $(obj)/vmlinux.syms FORCE

	$(call if_changed,dumpsyms)



OBJCOPYFLAGS_syms.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.decompressor.syms

$(obj)/syms.o: $(obj)/syms.bin FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_info.bin := -O binary --only-section=.vmlinux.info --set-section-flags .vmlinux.info=load

$(obj)/info.bin: vmlinux FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_info.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.info

$(obj)/info.o: $(obj)/info.bin FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_vmlinux.bin := -O binary --remove-section=.comment --remove-section=.vmlinux.info -S

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



suffix-$(CONFIG_KERNEL_GZIP)  := .gz

suffix-$(CONFIG_KERNEL_BZIP2) := .bz2

suffix-$(CONFIG_KERNEL_LZ4)  := .lz4

suffix-$(CONFIG_KERNEL_LZMA)  := .lzma

suffix-$(CONFIG_KERNEL_LZO)  := .lzo

suffix-$(CONFIG_KERNEL_XZ)  := .xz

suffix-$(CONFIG_KERNEL_ZSTD)  := .zst



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)

$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE

	$(call if_changed,bzip2_with_size)

$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lz4_with_size)

$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzma_with_size)

$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzo_with_size)

$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,xzkern_with_size)

$(obj)/vmlinux.bin.zst: $(obj)/vmlinux.bin FORCE

	$(call if_changed,zstd22_with_size)



OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed

$(obj)/piggy.o: $(obj)/vmlinux.bin$(suffix-y) FORCE

	$(call if_changed,objcopy)