[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 21/25] build: move device tree to per-target Make
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 21/25] build: move device tree to per-target Makefile |
Date: |
Wed, 6 Jun 2012 08:36:28 +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 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
- [Qemu-devel] [PATCH v2 00/25] per-directory Makefile.objs snippets, limit vpath (ab)use, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 01/25] build: remove trace-nested-y, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 23/25] build: limit usage of vpath, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 24/25] build: compile oslib-obj-y once, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 22/25] build: libcacard Makefile cleanups, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 09/25] build: put qom/ rules in a Makefile.objs file, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 21/25] build: move device tree to per-target Makefile,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 04/25] build: move *-user/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 19/25] build: convert libhw to nested Makefile.objs, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 08/25] build: move rules for nesting to Makefile.objs, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 03/25] build: add rules for nesting, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 13/25] build: move ui/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 07/25] build: move other target-*/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 02/25] build: do not sprinkle around GENERATED_HEADERS dependencies, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 05/25] build: move obj-TARGET-y variables to nested Makefile.objs, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 12/25] build: move fsdev/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 20/25] build: move per-target hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/06