Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- Makefile.target | 7 ------- hw/arm/Makefile.objs | 1 + hw/microblaze/Makefile.objs | 1 + hw/ppc/Makefile.objs | 1 + 4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Makefile.target b/Makefile.target index be09865..f25e278 100644 --- a/Makefile.target +++ b/Makefile.target @@ -143,13 +143,6 @@ else obj-y += hw/$(TARGET_BASE_ARCH)/ endif -# Device tree -ifeq ($(CONFIG_FDT), y) -obj-$(TARGET_ARM) += device_tree.o -obj-$(TARGET_MICROBLAZE) += device_tree.o -obj-$(TARGET_PPC) += device_tree.o -endif - main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 92b4f1e..a0ff6a6 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -35,5 +35,6 @@ obj-y += vexpress.o obj-y += strongarm.o obj-y += collie.o obj-y += pl041.o lm4549.o +obj-$(CONFIG_FDT) += ../device_tree.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index 4172442..020f7b6 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -9,5 +9,6 @@ obj-y += xilinx_uartlite.o obj-y += xilinx_ethlite.o obj-y += xilinx_axidma.o obj-y += xilinx_axienet.o +obj-$(CONFIG_FDT) += ../device_tree.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 5b09849..842e7b9 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -21,6 +21,7 @@ obj-y += virtex_ml507.o obj-$(CONFIG_KVM) += kvm_ppc.o # PowerPC OpenPIC obj-y += openpic.o +obj-$(CONFIG_FDT) += ../device_tree.o # Xilinx PPC peripherals obj-y += xilinx_intc.o -- 1.7.10.1
