[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 24/29] build: move device tree to per-target Make
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 24/29] build: move device tree to per-target Makefile.objs |
Date: |
Thu, 7 Jun 2012 09:40:09 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 5635043..3dfdf92 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -149,13 +149,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
- [Qemu-devel] [PATCH v3 28/29] configure: ensure directory exists when creating symlink, (continued)
- [Qemu-devel] [PATCH v3 28/29] configure: ensure directory exists when creating symlink, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 15/29] build: move fsdev/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 07/29] dump: do not compile dump.o for user-mode emulation, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 29/29] build: do not create directories at configure time, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 09/29] dump: remove dumping stuff from cpu-all.h, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 23/29] build: move per-target hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 20/29] build: move qga/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 27/29] build: compile oslib-obj-y once, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 08/29] dump: change cpu_get_note_size to return ssize_t, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 16/29] build: move ui/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 24/29] build: move device tree to per-target Makefile.objs,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 19/29] build: move qapi/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 18/29] build: move slirp/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 22/29] build: convert libhw to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 17/29] build: move audio/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 05/29] build: move obj-TARGET-y variables to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- Re: [Qemu-devel] [PULL v3 00/29] per-directory Makefile.objs snippets, limit vpath (ab)use, Andreas Färber, 2012/06/07
- Re: [Qemu-devel] [PULL v3 00/29] per-directory Makefile.objs snippets, limit vpath (ab)use, Anthony Liguori, 2012/06/08