Skip to content

Commit c37b830

Browse files
committed
arm64: efi: enable generic EFI compressed boot
Wire up the generic EFI zboot support for arm64. Signed-off-by: Ard Biesheuvel <[email protected]> Tested-by: Jeremy Linton <[email protected]> Acked-by: Catalin Marinas <[email protected]>
1 parent c5d5cba commit c37b830

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

arch/arm64/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,17 @@ libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
151151

152152
# Default target when executing plain make
153153
boot := arch/arm64/boot
154+
155+
ifeq ($(CONFIG_EFI_ZBOOT),)
154156
KBUILD_IMAGE := $(boot)/Image.gz
157+
else
158+
KBUILD_IMAGE := $(boot)/vmlinuz.efi
159+
endif
155160

156-
all: Image.gz
161+
all: $(notdir $(KBUILD_IMAGE))
157162

158163

159-
Image: vmlinux
164+
Image vmlinuz.efi: vmlinux
160165
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
161166

162167
Image.%: Image

arch/arm64/boot/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
Image
33
Image.gz
4+
vmlinuz*

arch/arm64/boot/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ $(obj)/Image.lzo: $(obj)/Image FORCE
3838

3939
$(obj)/Image.zst: $(obj)/Image FORCE
4040
$(call if_changed,zstd)
41+
42+
EFI_ZBOOT_PAYLOAD := Image
43+
EFI_ZBOOT_BFD_TARGET := elf64-littleaarch64
44+
EFI_ZBOOT_MACH_TYPE := ARM64
45+
46+
include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot

0 commit comments

Comments
 (0)