* [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT
@ 2013-03-11 10:31 Paolo Bonzini
2013-03-11 10:38 ` Peter Maydell
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Paolo Bonzini @ 2013-03-11 10:31 UTC (permalink / raw)
To: qemu-devel; +Cc: blauwirbel, peter.maydell, aliguori
A conflict was resolved the wrong way when merging commit 320ba5f (build:
always link device_tree.o into emulators if libfdt available, 2013-02-05).
This causes a build failure for the arm-softmmu target due to multiply
defined symbol.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/arm/Makefile.objs | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 2d9c69d..f5f7d0e 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o
obj-y += framebuffer.o
obj-y += strongarm.o
obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
-obj-$(CONFIG_FDT) += ../device_tree.o
obj-$(CONFIG_KVM) += kvm/arm_gic.o
obj-y := $(addprefix ../,$(obj-y))
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT
2013-03-11 10:31 [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT Paolo Bonzini
@ 2013-03-11 10:38 ` Peter Maydell
2013-03-11 13:04 ` Anthony Liguori
2013-03-12 2:01 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2013-03-11 10:38 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: blauwirbel, aliguori, qemu-devel
On 11 March 2013 10:31, Paolo Bonzini <pbonzini@redhat.com> wrote:
> A conflict was resolved the wrong way when merging commit 320ba5f (build:
> always link device_tree.o into emulators if libfdt available, 2013-02-05).
> This causes a build failure for the arm-softmmu target due to multiply
> defined symbol.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Fixes the --enable-fdt build and ARM targets using device tree
work OK.
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT
2013-03-11 10:31 [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT Paolo Bonzini
2013-03-11 10:38 ` Peter Maydell
@ 2013-03-11 13:04 ` Anthony Liguori
2013-03-12 2:01 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2013-03-11 13:04 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: blauwirbel, peter.maydell
Paolo Bonzini <pbonzini@redhat.com> writes:
> A conflict was resolved the wrong way when merging commit 320ba5f (build:
> always link device_tree.o into emulators if libfdt available, 2013-02-05).
> This causes a build failure for the arm-softmmu target due to multiply
> defined symbol.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Applied, thanks. I've added libfdt to my build server to prevent this
in the future.
Regards,
Anthony Liguori
> ---
> hw/arm/Makefile.objs | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 2d9c69d..f5f7d0e 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o
> obj-y += framebuffer.o
> obj-y += strongarm.o
> obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
> -obj-$(CONFIG_FDT) += ../device_tree.o
> obj-$(CONFIG_KVM) += kvm/arm_gic.o
>
> obj-y := $(addprefix ../,$(obj-y))
> --
> 1.8.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT
2013-03-11 10:31 [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT Paolo Bonzini
2013-03-11 10:38 ` Peter Maydell
2013-03-11 13:04 ` Anthony Liguori
@ 2013-03-12 2:01 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2013-03-12 2:01 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: blauwirbel, peter.maydell, aliguori
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-12 2:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-11 10:31 [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT Paolo Bonzini
2013-03-11 10:38 ` Peter Maydell
2013-03-11 13:04 ` Anthony Liguori
2013-03-12 2:01 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).