aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2018-06-19 19:12:15 +0200
committerBin Meng <bmeng.cn@gmail.com>2018-06-24 08:56:04 +0800
commitcbd29ef9f1bbd837f363eb3f80a2f6ed9400a87c (patch)
tree22db497a46755a969565c114e7cfb55410d87d34
parent7ec2c21d8760fc26d93f0535588c515623d46627 (diff)
downloadu-boot-cbd29ef9f1bbd837f363eb3f80a2f6ed9400a87c.zip
u-boot-cbd29ef9f1bbd837f363eb3f80a2f6ed9400a87c.tar.gz
u-boot-cbd29ef9f1bbd837f363eb3f80a2f6ed9400a87c.tar.bz2
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>
-rw-r--r--arch/x86/cpu/qemu/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile
index 1761244..b7dd5bd 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