Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 183ab05f authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Martin Schwidefsky
Browse files

s390: get rid of the first mb of uncompressed image 



Instead of generating uncompressed kernel image starting at 0, filling
first mb with zeros (with ".org 0x100000") and then trimming it off
from vmlinux.bin before compression, simply generate a kernel image
starting from 0x100000.

Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 8e533fdd

arch/s390/boot/compressed/Makefile

+4 −11
Original line number Diff line number Diff line
@@ -23,16 +23,12 @@ LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T 
$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS)

	$(call if_changed,ld)



TRIM_HEAD_SIZE := 0x100000



sed-sizes := -e 's/^\([0-9a-fA-F]*\) . \(__bss_start\|_end\)$$/\#define SZ\2 (0x\1 - $(TRIM_HEAD_SIZE))/p'

# extract required uncompressed vmlinux symbols and adjust them to reflect offsets inside vmlinux.bin

sed-sizes := -e 's/^\([0-9a-fA-F]*\) . \(__bss_start\|_end\)$$/\#define SZ\2 (0x\1 - 0x100000)/p'



quiet_cmd_sizes = GEN     $@

      cmd_sizes = $(NM) $< | sed -n $(sed-sizes) > $@



quiet_cmd_trim_head = TRIM    $@

      cmd_trim_head = tail -c +$$(($(TRIM_HEAD_SIZE) + 1)) $< > $@



$(obj)/sizes.h: vmlinux

	$(call if_changed,sizes)
@@ -42,13 +38,10 @@ $(obj)/head.o: $(obj)/sizes.h 
CFLAGS_misc.o += -I$(objtree)/$(obj)

$(obj)/misc.o: $(obj)/sizes.h



OBJCOPYFLAGS_vmlinux.bin.full :=  -R .comment -S

$(obj)/vmlinux.bin.full: vmlinux

OBJCOPYFLAGS_vmlinux.bin :=  -R .comment -S

$(obj)/vmlinux.bin: vmlinux

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin: $(obj)/vmlinux.bin.full

	$(call if_changed,trim_head)



vmlinux.bin.all-y := $(obj)/vmlinux.bin



suffix-$(CONFIG_KERNEL_GZIP)  := .gz

arch/s390/kernel/head64.S

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <asm/page.h>



__HEAD

	.org	0x100000

ENTRY(startup_continue)

	tm	__LC_STFLE_FAC_LIST+5,0x80	# LPP available ?

	jz	0f

arch/s390/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ PHDRS { 


SECTIONS

{

	. = 0x00000000;

	. = 0x100000;

	.text : {

		/* Text and read-only data */

		HEAD_TEXT