Commit b2747f10 authored by Benjamin Segall's avatar Benjamin Segall Committed by Borislav Petkov (AMD)
Browse files

x86/boot: Don't add the EFI stub to targets, again 



This is a re-commit of

  da05b143 ("x86/boot: Don't add the EFI stub to targets")

after the tagged patch incorrectly reverted it.

vmlinux-objs-y is added to targets, with an assumption that they are all
relative to $(obj); adding a $(objtree)/drivers/...  path causes the
build to incorrectly create a useless
arch/x86/boot/compressed/drivers/...  directory tree.

Fix this just by using a different make variable for the EFI stub.

Fixes: cb8bda8a ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S")
Signed-off-by: default avatarBen Segall <bsegall@google.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Cc: stable@vger.kernel.org # v6.1+
Link: https://lore.kernel.org/r/xm267ceukksz.fsf@bsegall.svl.corp.google.com
parent 8c860ed8

arch/x86/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ 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-objs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a

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



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

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

	$(call if_changed,ld)



OBJCOPYFLAGS_vmlinux.bin :=  -R .comment -S