Commit fb84cefd authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

x86/efi/mixed: Move mixed mode startup code into libstub 



The EFI mixed mode code has been decoupled from the legacy decompressor,
in order to be able to reuse it with generic EFI zboot images for x86.

Move the source file into the libstub source directory to facilitate
this.

Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent b891e420

arch/x86/boot/compressed/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ vmlinux-objs-$(CONFIG_INTEL_TDX_GUEST) += $(obj)/tdx.o $(obj)/tdcall.o $(obj)/td 
vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/mem.o



vmlinux-objs-$(CONFIG_EFI) += $(obj)/efi.o

vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_mixed.o

vmlinux-libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a



$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE

drivers/firmware/efi/libstub/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO), $(KBUILD_CFLAGS)) 
# `-fdata-sections` flag from KBUILD_CFLAGS_KERNEL

KBUILD_CFLAGS_KERNEL := $(filter-out -fdata-sections, $(KBUILD_CFLAGS_KERNEL))



KBUILD_AFLAGS			:= $(KBUILD_CFLAGS) -D__ASSEMBLY__



lib-y				:= efi-stub-helper.o gop.o secureboot.o tpm.o \

				   file.o mem.o random.o randomalloc.o pci.o \

				   skip_spaces.o lib-cmdline.o lib-ctype.o \
@@ -83,6 +85,7 @@ lib-$(CONFIG_EFI_GENERIC_STUB) += efi-stub.o string.o intrinsics.o systable.o \ 
lib-$(CONFIG_ARM)		+= arm32-stub.o

lib-$(CONFIG_ARM64)		+= kaslr.o arm64.o arm64-stub.o smbios.o

lib-$(CONFIG_X86)		+= x86-stub.o smbios.o

lib-$(CONFIG_EFI_MIXED)		+= x86-mixed.o

lib-$(CONFIG_X86_64)		+= x86-5lvl.o

lib-$(CONFIG_RISCV)		+= kaslr.o riscv.o riscv-stub.o

lib-$(CONFIG_LOONGARCH)		+= loongarch.o loongarch-stub.o