| Message ID | 20180619171215.3037-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | [U-Boot,v2,1/1] x86: qemu: do not build car.o with start64.o | expand |
On 19 June 2018 at 11:12, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > car.o can only be used with start.o, not with start64.o. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > v2 > rebase to current master > shorten commit message > --- > arch/x86/cpu/qemu/Makefile | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Wed, Jun 20, 2018 at 1:12 AM, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > car.o can only be used with start.o, not with start64.o. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > v2 > rebase to current master > shorten commit message > --- > arch/x86/cpu/qemu/Makefile | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Thu, Jun 21, 2018 at 12:30 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > On Wed, Jun 20, 2018 at 1:12 AM, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: >> car.o can only be used with start.o, not with start64.o. >> >> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> >> --- >> v2 >> rebase to current master >> shorten commit message >> --- >> arch/x86/cpu/qemu/Makefile | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index e5ea92545e3..b1daffd4a32 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> +ifndef CONFIG_$(SPL_)X86_64 +obj-y += car.o +endif -obj-y += car.o dram.o +obj-y += dram.o obj-y += qemu.o obj-$(CONFIG_QFW) += cpu.o e820.o
car.o can only be used with start.o, not with start64.o. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- v2 rebase to current master shorten commit message --- arch/x86/cpu/qemu/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)