Commit 4f2d1bbc authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/boot: Move the EFI mixed mode startup code back under arch/x86, into startup/ 



Linus expressed a strong preference for arch-specific asm code (i.e.,
virtually all of it) to reside under arch/ rather than anywhere else.

So move the EFI mixed mode startup code back, and put it under
arch/x86/boot/startup/ where all shared x86 startup code is going to
live.

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20250401133416.1436741-11-ardb+git@google.com
parent 5a67da1f

arch/x86/boot/startup/Makefile

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



KBUILD_AFLAGS		+= -D__DISABLE_EXPORTS



lib-$(CONFIG_X86_64)		+= la57toggle.o

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

drivers/firmware/efi/libstub/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 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