From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Tue, 19 Jun 2018 17:12:15 +0000 (+0200)
Subject: x86: qemu: do not build car.o with start64.o
X-Git-Tag: v2018.07-rc3~18^2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cbd29ef9f1bbd837f363eb3f80a2f6ed9400a87c;p=oweals%2Fu-boot.git

x86: qemu: do not build car.o with start64.o

car.o can only be used with start.o, not with start64.o.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile
index 1761244178..b7dd5bd46c 100644
--- a/arch/x86/cpu/qemu/Makefile
+++ b/arch/x86/cpu/qemu/Makefile
@@ -2,6 +2,9 @@
 #
 # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
 
-obj-y += car.o dram.o
+ifndef CONFIG_$(SPL_)X86_64
+obj-y += car.o
+endif
+obj-y += dram.o
 obj-y += qemu.o
 obj-$(CONFIG_QFW) += cpu.o e820.o