From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sb9to-0002Ov-NO for qemu-devel@nongnu.org; Sun, 03 Jun 2012 08:27:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sb9tm-0001tb-RB for qemu-devel@nongnu.org; Sun, 03 Jun 2012 08:27:12 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:51378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sb9tm-0001jX-Im for qemu-devel@nongnu.org; Sun, 03 Jun 2012 08:27:10 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so5284643pbb.4 for ; Sun, 03 Jun 2012 05:27:09 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sun, 3 Jun 2012 14:25:55 +0200 Message-Id: <1338726358-30681-22-git-send-email-pbonzini@redhat.com> In-Reply-To: <1338726358-30681-1-git-send-email-pbonzini@redhat.com> References: <1338726358-30681-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 21/24] move device tree to per-target Makefile List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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