X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Fx86%2FMakefile;h=4be1c353cc9e2bcb1a396938a28f355136a1caaf;hb=a79e8dfed6e8dad5887d37b59a497b8ebb17f8fa;hp=36a601822a204c476be6f129e2c810498763c765;hpb=bd5053ffa5b8162257537bdb79ba829372423096;p=u-boot

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 36a601822a..4be1c353cc 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -2,11 +2,16 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
+ifeq ($(CONFIG_EFI_APP),)
+ifdef CONFIG_$(SPL_)X86_64
+head-y := arch/x86/cpu/start64.o
+else
 head-y := arch/x86/cpu/start.o
-ifeq ($(CONFIG_SPL_BUILD),y)
-head-y += arch/x86/cpu/start16.o
-head-y += arch/x86/cpu/resetvec.o
 endif
+endif
+
+head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/start16.o
+head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/resetvec.o
 
 libs-y += arch/x86/cpu/
 libs-y += arch/x86/lib/