X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Fx86%2FMakefile;h=4be1c353cc9e2bcb1a396938a28f355136a1caaf;hb=66c246cce7c66019a93ff7105157c3e2126dd277;hp=d104a497301dd3e41b828a03beda6178e40fbae8;hpb=1a2728ae4faf12874173de156b8a7e66cfbbeae5;p=u-boot

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index d104a49730..4be1c353cc 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -3,12 +3,15 @@
 #
 
 ifeq ($(CONFIG_EFI_APP),)
+ifdef CONFIG_$(SPL_)X86_64
+head-y := arch/x86/cpu/start64.o
+else
 head-y := arch/x86/cpu/start.o
 endif
-ifeq ($(CONFIG_SPL_BUILD),y)
-head-y += arch/x86/cpu/start16.o
-head-y += arch/x86/cpu/resetvec.o
 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/