mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
riscv/purgatory: Omit use of bin2c
The .incbin assembler directive is much faster than bin2c + $(CC).
Do similar refactoring as in commit 4c0f032d49
("s390/purgatory:
Omit use of bin2c").
Please note the .quad directive matches to size_t in C (both 8 byte)
because the purgatory is compiled only for the 64-bit kernel.
(KEXEC_FILE depends on 64BIT).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20220625223438.835408-2-masahiroy@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
parent
788177e765
commit
d8357e3bf8
5 changed files with 17 additions and 9 deletions
|
@ -494,7 +494,6 @@ config KEXEC_FILE
|
||||||
|
|
||||||
config ARCH_HAS_KEXEC_PURGATORY
|
config ARCH_HAS_KEXEC_PURGATORY
|
||||||
def_bool KEXEC_FILE
|
def_bool KEXEC_FILE
|
||||||
select BUILD_BIN2C
|
|
||||||
depends on CRYPTO=y
|
depends on CRYPTO=y
|
||||||
depends on CRYPTO_SHA256=y
|
depends on CRYPTO_SHA256=y
|
||||||
|
|
||||||
|
|
1
arch/riscv/purgatory/.gitignore
vendored
1
arch/riscv/purgatory/.gitignore
vendored
|
@ -1,4 +1,3 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
purgatory.chk
|
purgatory.chk
|
||||||
purgatory.ro
|
purgatory.ro
|
||||||
kexec-purgatory.c
|
|
||||||
|
|
|
@ -84,12 +84,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
|
||||||
$(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE
|
$(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE
|
||||||
$(call if_changed,ld)
|
$(call if_changed,ld)
|
||||||
|
|
||||||
targets += kexec-purgatory.c
|
$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk
|
||||||
|
|
||||||
quiet_cmd_bin2c = BIN2C $@
|
|
||||||
cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
|
|
||||||
|
|
||||||
$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
|
|
||||||
$(call if_changed,bin2c)
|
|
||||||
|
|
||||||
obj-y += kexec-purgatory.o
|
obj-y += kexec-purgatory.o
|
||||||
|
|
14
arch/riscv/purgatory/kexec-purgatory.S
Normal file
14
arch/riscv/purgatory/kexec-purgatory.S
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
|
||||||
|
.section .rodata, "a"
|
||||||
|
|
||||||
|
.align 8
|
||||||
|
kexec_purgatory:
|
||||||
|
.globl kexec_purgatory
|
||||||
|
.incbin "arch/riscv/purgatory/purgatory.ro"
|
||||||
|
.Lkexec_purgatroy_end:
|
||||||
|
|
||||||
|
.align 8
|
||||||
|
kexec_purgatory_size:
|
||||||
|
.globl kexec_purgatory_size
|
||||||
|
.quad .Lkexec_purgatroy_end - kexec_purgatory
|
|
@ -40,6 +40,8 @@ if [ -n "${building_out_of_srctree}" ]; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
rm -f arch/riscv/purgatory/kexec-purgatory.c
|
||||||
|
|
||||||
rm -f scripts/extract-cert
|
rm -f scripts/extract-cert
|
||||||
|
|
||||||
rm -f arch/x86/purgatory/kexec-purgatory.c
|
rm -f arch/x86/purgatory/kexec-purgatory.c
|
||||||
|
|
Loading…
Add table
Reference in a new issue