Skip to content

Commit b2747f1

Browse files
Benjamin Segallbp3tk0v
authored andcommitted
x86/boot: Don't add the EFI stub to targets, again
This is a re-commit of da05b14 ("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: cb8bda8 ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S") Signed-off-by: Ben Segall <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Cc: [email protected] # v6.1+ Link: https://lore.kernel.org/r/[email protected]
1 parent 8c860ed commit b2747f1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/boot/compressed/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/mem.o
105105

106106
vmlinux-objs-$(CONFIG_EFI) += $(obj)/efi.o
107107
vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_mixed.o
108-
vmlinux-objs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
108+
vmlinux-libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
109109

110-
$(obj)/vmlinux: $(vmlinux-objs-y) FORCE
110+
$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE
111111
$(call if_changed,ld)
112112

113113
OBJCOPYFLAGS_vmlinux.bin := -R .comment -S

0 commit comments

Comments
 (0)