[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/24] move device tree to per-target Makefile
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 21/24] move device tree to per-target Makefile |
Date: |
Sun, 3 Jun 2012 14:25:55 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.target | 7 -------
hw/arm/Makefile | 1 +
hw/microblaze/Makefile | 1 +
hw/ppc/Makefile | 1 +
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 1770901..5bd5538 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -145,13 +145,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 b/hw/arm/Makefile
index 92b4f1e..a0ff6a6 100644
--- a/hw/arm/Makefile
+++ b/hw/arm/Makefile
@@ -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 b/hw/microblaze/Makefile
index 4172442..020f7b6 100644
--- a/hw/microblaze/Makefile
+++ b/hw/microblaze/Makefile
@@ -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 b/hw/ppc/Makefile
index 8fb7633..070f497 100644
--- a/hw/ppc/Makefile
+++ b/hw/ppc/Makefile
@@ -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
- Re: [Qemu-devel] [PATCH 19/24] convert libhw to nested Makefiles, (continued)
- [Qemu-devel] [PATCH 20/24] move per-target hw/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 17/24] move qga/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 24/24] compile oslib-obj-y once, Paolo Bonzini, 2012/06/03
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Blue Swirl, 2012/06/03
- [Qemu-devel] [PATCH 16/24] move qapi/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 22/24] libcacard Makefile cleanups, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 23/24] limit usage of vpath, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 21/24] move device tree to per-target Makefile,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Andreas Färber, 2012/06/03
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Anthony Liguori, 2012/06/03
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Paolo Bonzini, 2012/06/04
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Lluís Vilanova, 2012/06/04
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Eric Blake, 2012/06/04
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Paolo Bonzini, 2012/06/05
Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Anthony Liguori, 2012/06/03
Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Lluís Vilanova, 2012/06/04