diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-29 17:42:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-29 17:42:33 -0700 |
| commit | 825a0714d2b3883d4f8ff64f6933fb73ee3f1834 (patch) | |
| tree | ea21f8d69ee64bd984289803497790b57fa7e564 /arch/arm64/boot | |
| parent | 17d4ded2fc9d4f0b7c3c74ed9f80420c59d36e0b (diff) | |
| parent | 026b85796ab4d52af56f8a1c60d2613983ecd845 (diff) | |
| download | linux-stable-825a0714d2b3883d4f8ff64f6933fb73ee3f1834.tar.gz linux-stable-825a0714d2b3883d4f8ff64f6933fb73ee3f1834.tar.bz2 linux-stable-825a0714d2b3883d4f8ff64f6933fb73ee3f1834.zip | |
Merge tag 'efi-next-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI updates from Ard Biesheuvel:
- relocate the LoongArch kernel if the preferred address is already
occupied
- implement BTI annotations for arm64 EFI stub and zboot images
- clean up arm64 zboot Kbuild rules for injecting the kernel code size
* tag 'efi-next-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi/zboot: arm64: Grab code size from ELF symbol in payload
efi/zboot: arm64: Inject kernel code size symbol into the zboot payload
efi/zboot: Set forward edge CFI compat header flag if supported
efi/zboot: Add BSS padding before compression
arm64: efi: Enable BTI codegen and add PE/COFF annotation
efi/pe: Import new BTI/IBT header flags from the spec
efi/loongarch: Reintroduce efi_relocate_kernel() to relocate kernel
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index c65aee088410..1761f5972443 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -42,5 +42,9 @@ $(obj)/Image.zst: $(obj)/Image FORCE EFI_ZBOOT_PAYLOAD := Image EFI_ZBOOT_BFD_TARGET := elf64-littleaarch64 EFI_ZBOOT_MACH_TYPE := ARM64 +EFI_ZBOOT_FORWARD_CFI := $(CONFIG_ARM64_BTI_KERNEL) + +EFI_ZBOOT_OBJCOPY_FLAGS = --add-symbol zboot_code_size=0x$(shell \ + $(NM) vmlinux|grep _kernel_codesize|cut -d' ' -f1) include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot |