From patchwork Mon Jul 9 14:04:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 169850 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 F269B2C0089 for ; Tue, 10 Jul 2012 00:05:12 +1000 (EST) Received: from localhost ([::1]:47740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoEaM-0003ns-Pw for incoming@patchwork.ozlabs.org; Mon, 09 Jul 2012 10:05:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoEa9-0003kx-4a for qemu-devel@nongnu.org; Mon, 09 Jul 2012 10:05:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoEa2-0004Zn-Mv for qemu-devel@nongnu.org; Mon, 09 Jul 2012 10:04:56 -0400 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.31]:41509 helo=va3outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoEZp-0004Xv-No; Mon, 09 Jul 2012 10:04:37 -0400 Received: from mail182-va3-R.bigfish.com (10.7.14.235) by VA3EHSOBE002.bigfish.com (10.7.40.22) with Microsoft SMTP Server id 14.1.225.23; Mon, 9 Jul 2012 14:02:18 +0000 Received: from mail182-va3 (localhost [127.0.0.1]) by mail182-va3-R.bigfish.com (Postfix) with ESMTP id 2B7B34E010C; Mon, 9 Jul 2012 14:02:18 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h944hd25hf0ah107ah) Received: from mail182-va3 (localhost.localdomain [127.0.0.1]) by mail182-va3 (MessageSwitch) id 1341842536615406_8223; Mon, 9 Jul 2012 14:02:16 +0000 (UTC) Received: from VA3EHSMHS018.bigfish.com (unknown [10.7.14.235]) by mail182-va3.bigfish.com (Postfix) with ESMTP id 88CA72C01BE; Mon, 9 Jul 2012 14:02:16 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS018.bigfish.com (10.7.99.28) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 9 Jul 2012 14:02:16 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.298.5; Mon, 9 Jul 2012 09:04:31 -0500 Received: from tyr.buserror.net ([10.214.82.190]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q69E4UBT004453; Mon, 9 Jul 2012 07:04:30 -0700 Date: Mon, 9 Jul 2012 09:04:29 -0500 From: Scott Wood To: Message-ID: <20120709140429.GA25506@tyr.buserror.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 216.32.180.31 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] PPC: e500: reconditionalize on 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 Recent patches "PPC: e500: rename mpc8544ds into generic file", "PPC: e500: split mpc8544ds machine from generic e500 code", and "PPC: e500: add generic e500 platform" moved certain e500-related files to the bottom of the makefile because they're now in ppc/, but the dependency on CONFIG_FDT was accidentally dropped. This broke the build when FDT support is not enabled. Signed-off-by: Scott Wood Reviewed-by: Andreas Färber --- hw/ppc/Makefile.objs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 81bcc72..951e407 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -27,4 +27,4 @@ obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) -obj-y += e500.o mpc8544ds.o e500plat.o +obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o