From patchwork Mon Mar 11 10:31:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 226514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E36A2C0293 for ; Mon, 11 Mar 2013 21:31:51 +1100 (EST) Received: from localhost ([::1]:44721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF01E-0003RS-JK for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2013 06:31:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF010-0003RC-2X for qemu-devel@nongnu.org; Mon, 11 Mar 2013 06:31:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UF00y-00013R-F5 for qemu-devel@nongnu.org; Mon, 11 Mar 2013 06:31:34 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:62341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF00y-00013G-8M for qemu-devel@nongnu.org; Mon, 11 Mar 2013 06:31:32 -0400 Received: by mail-wg0-f50.google.com with SMTP id es5so4830059wgb.5 for ; Mon, 11 Mar 2013 03:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=JcCPxR/6bN/19nwdwXqNFrIrDp5Rtb1RgNbBaOTc7ZQ=; b=KalO1nd+3N3QMkGIwuJGB9fs0eL6CXZRnEFO2OawT5BQrEjCk8l5W3wN1FPeOGOSWg CNy4nqmIheigSJx3039ow4D5AUuTrsoV1NzMY72ix98YtulYm5Eb1BjSPYV2TpMo8VNo E9gxfc4HN0RpUKDnYiMxPO4XfU3eAC9FfoS9dvkmQ9jc61n04KtoXVvtDdRedWwK7mug 8r8TRkl3RiwTXmcTgCB8oYC/kQ0616xw9C61TjI2CVwT7ZNf4sykr4Gb/Gpaf2v3G8iO SQ6bUiB9NWvE3pUUo4lrzVXQDaadVTRXlNeA7XF6Te/7T6ZHZZAPbBl+abGRUAF2Tsjr ER1w== X-Received: by 10.194.237.40 with SMTP id uz8mr17699748wjc.49.1362997891122; Mon, 11 Mar 2013 03:31:31 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id bs6sm16180149wib.4.2013.03.11.03.31.29 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 11 Mar 2013 03:31:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2013 11:31:26 +0100 Message-Id: <1362997886-9470-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.82.50 Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org A conflict was resolved the wrong way when merging commit 320ba5f (build: always link device_tree.o into emulators if libfdt available, 2013-02-05). This causes a build failure for the arm-softmmu target due to multiply defined symbol. Signed-off-by: Paolo Bonzini Tested-by: Peter Maydell --- hw/arm/Makefile.objs | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 2d9c69d..f5f7d0e 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o obj-y += strongarm.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o -obj-$(CONFIG_FDT) += ../device_tree.o obj-$(CONFIG_KVM) += kvm/arm_gic.o obj-y := $(addprefix ../,$(obj-y))