Skip to content

Commit 4c0f032

Browse files
Philipp RudoMartin Schwidefsky
authored andcommitted
s390/purgatory: Omit use of bin2c
Omit use of script/bin2c hack. Directly include into assembler file instead. Signed-off-by: Philipp Rudo <prudo@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
1 parent 61f3f8f commit 4c0f032

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

arch/s390/purgatory/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OBJECT_FILES_NON_STANDARD := y
44

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

7-
targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro kexec-purgatory.c
7+
targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro
88
PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
99

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

37-
quiet_cmd_bin2c = BIN2C $@
38-
cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
39-
40-
$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE
41-
$(call if_changed,bin2c)
37+
$(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE
38+
$(call if_changed_rule,as_o_S)
4239

4340
obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
3+
.section .rodata, "a"
4+
5+
.align 8
6+
kexec_purgatory:
7+
.globl kexec_purgatory
8+
.incbin "arch/s390/purgatory/purgatory.ro"
9+
.Lkexec_purgatroy_end:
10+
11+
.align 8
12+
kexec_purgatory_size:
13+
.globl kexec_purgatory_size
14+
.quad .Lkexec_purgatroy_end - kexec_purgatory

0 commit comments

Comments
 (0)