From patchwork Tue Mar 5 17:17:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 225112 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 B86B32C0342 for ; Wed, 6 Mar 2013 04:35:25 +1100 (EST) Received: from localhost ([::1]:55365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvXZ-0002Lj-7w for incoming@patchwork.ozlabs.org; Tue, 05 Mar 2013 12:20:37 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvVR-0007oK-SR for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:18:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCvVQ-0004L7-Ph for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:18:25 -0500 Received: from mail-qa0-f44.google.com ([209.85.216.44]:35474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvVQ-0004L2-M0 for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:18:24 -0500 Received: by mail-qa0-f44.google.com with SMTP id bv4so2033745qab.17 for ; Tue, 05 Mar 2013 09:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=YqCAdsFEwyeOu1HOL+PDvdeoaqT19ZSq1wbcRzD2Ddk=; b=MNctro6cHj3xqjClhLNrQJiXFGOR79NzMRT9aiXgWOi3Efrgcu8iO24CLWXSV+Qi3f 8OFN+mMlPdYg7NHgs18//04WLtP69wFroJgqJafgbX0eWLUW/qdXkNMVye7olh4rXzv5 xjFdB+B37sz1pkzKuI3VNkWzlbqvCLvnfpaHPkJSnyqYB6uv+ex02Uj4HTJjint9l2Cg BTn0EjuonsuhUqGA1FV9juzzknWrpluLa01rKEeSRaS94pd/SZoxzEfwTSxgN7B2u2nL LlBiqixx22DmtFxwm1oqrGFeqEK3r5OYsgbWhQs7GQsziQcf62H9JuHjeuhYyu7pXYp1 Y3qQ== X-Received: by 10.229.202.132 with SMTP id fe4mr8934401qcb.14.1362503904345; Tue, 05 Mar 2013 09:18:24 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id ku2sm5717907qeb.4.2013.03.05.09.18.23 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Mar 2013 09:18:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2013 18:17:38 +0100 Message-Id: <1362503865-27292-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362503865-27292-1-git-send-email-pbonzini@redhat.com> References: <1362503865-27292-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.44 Subject: [Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/ 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 Signed-off-by: Paolo Bonzini --- configure | 3 --- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 2 ++ default-configs/ppcemb-softmmu.mak | 1 + hw/ppc/Makefile.objs | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 8fdc2cf..ae3d9c5 100755 --- a/configure +++ b/configure @@ -4144,9 +4144,6 @@ case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak esac -if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then - echo "CONFIG_PSERIES=y" >> $config_target_mak -fi if test "$target_bigendian" = "yes" ; then echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak fi diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index f9f8a81..c209a8d 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -40,3 +40,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_E500=$(CONFIG_FDT) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index dc44294..8d490bd 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -40,3 +40,5 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_PSERIES=$(CONFIG_FDT) +CONFIG_E500=$(CONFIG_FDT) diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 1c6bcf9..7f13421 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -35,3 +35,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_E500=$(CONFIG_FDT) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index bbbe78e..9141373 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -11,7 +11,7 @@ obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o obj-y += ppc440_bamboo.o # PowerPC E500 boards -obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o +obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. obj-y += virtex_ml507.o # PowerPC OpenPIC @@ -29,4 +29,4 @@ obj-y += mac_oldworld.o # NewWorld PowerMac obj-y += mac_newworld.o # e500 -obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o +obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o