projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ec2c21
)
x86: qemu: do not build car.o with start64.o
author
Heinrich Schuchardt
<xypron.glpk@gmx.de>
Tue, 19 Jun 2018 17:12:15 +0000
(19:12 +0200)
committer
Bin Meng
<bmeng.cn@gmail.com>
Sun, 24 Jun 2018 00:56:04 +0000
(08:56 +0800)
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>
arch/x86/cpu/qemu/Makefile
patch
|
blob
|
history
diff --git
a/arch/x86/cpu/qemu/Makefile
b/arch/x86/cpu/qemu/Makefile
index 17612441789fad12e42c5af6831210b89646999a..b7dd5bd46c7250963729454f8e8f785f81c9cd8c 100644
(file)
--- 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