From: Bin Meng Date: Thu, 16 Oct 2014 14:58:20 +0000 (+0800) Subject: x86: Fix rom version build with CONFIG_X86_RESET_VECTOR X-Git-Tag: v2015.01-rc1~210 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb00601ed6b8e9eca9d85c606de08cbd76b9d05f;p=oweals%2Fu-boot.git x86: Fix rom version build with CONFIG_X86_RESET_VECTOR When building U-Boot with CONFIG_X86_RESET_VECTOR, the linking process misses the resetvec.o and start16.o so it cannot generate the rom version of U-Boot. The arch/x86/cpu/Makefile is updated to pull them into the final linking process. Signed-off-by: Bin Meng Acked-by: Simon Glass --- diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 415bc24989..e7bb3e33d5 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -9,5 +9,5 @@ # extra-y = start.o -extra-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o -obj-y = interrupts.o cpu.o +obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o +obj-y += interrupts.o cpu.o