aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/boot/compressed
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-06-12 15:11:40 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-06-25 10:14:38 +0200
commit8282cd64d0f9a5292e9f8408a96733523e7f1fec (patch)
tree7be0fc5a7a351a394c92b1b4463bed6ac8e0c74b /arch/s390/boot/compressed
parents390/decompressor: trim the kernel image up to 1M (diff)
downloadlinux-dev-8282cd64d0f9a5292e9f8408a96733523e7f1fec.tar.xz
linux-dev-8282cd64d0f9a5292e9f8408a96733523e7f1fec.zip
s390/boot: make head.S and als.c be part of the decompressor only
Since uncompressed kernel image does not have to be bootable anymore, move head.S, head_kdump.S and als.c to boot/ folder and compile them in just in the decompressor. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/boot/compressed')
-rw-r--r--arch/s390/boot/compressed/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
index 9b48e7b86fc8..855f7fdb1f61 100644
--- a/arch/s390/boot/compressed/Makefile
+++ b/arch/s390/boot/compressed/Makefile
@@ -16,12 +16,12 @@ targets += misc.o piggy.o sizes.h head.o
KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)
KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)
-OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o ebcdic.o als.o)
+OBJECTS := $(objtree)/arch/s390/kernel/ebcdic.o
OBJECTS += $(objtree)/drivers/s390/char/sclp_early_core.o
OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o
LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T
-$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS)
+$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS)
$(call if_changed,ld)
TRIM_HEAD_SIZE := 0x100000