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

Commit 4c0f032d authored by Philipp Rudo's avatar Philipp Rudo Committed by Martin Schwidefsky
Browse files

s390/purgatory: Omit use of bin2c 



Omit use of script/bin2c hack. Directly include into assembler file instead.

Signed-off-by: default avatarPhilipp Rudo <prudo@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 61f3f8fc

arch/s390/purgatory/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ OBJECT_FILES_NON_STANDARD := y 


purgatory-y := head.o purgatory.o string.o sha256.o mem.o



targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro kexec-purgatory.c

targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro

PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))



$(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
@@ -34,10 +34,7 @@ OBJCOPYFLAGS_purgatory.ro += --remove-section='.note.*' 
$(obj)/purgatory.ro: $(obj)/purgatory FORCE

		$(call if_changed,objcopy)



quiet_cmd_bin2c = BIN2C   $@

      cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@



$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE

	$(call if_changed,bin2c)

$(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE

	$(call if_changed_rule,as_o_S)



obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o

arch/s390/purgatory/kexec-purgatory.S

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



	.section .rodata, "a"



	.align	8

kexec_purgatory:

	.globl	kexec_purgatory

	.incbin	"arch/s390/purgatory/purgatory.ro"

.Lkexec_purgatroy_end:



	.align	8

kexec_purgatory_size:

	.globl	kexec_purgatory_size

	.quad	.Lkexec_purgatroy_end - kexec_purgatory