From patchwork Mon Feb 10 16:22:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 318810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6545D2C00B3 for ; Tue, 11 Feb 2014 03:24:51 +1100 (EST) Received: from localhost ([::1]:56389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtf6-0001A1-FG for incoming@patchwork.ozlabs.org; Mon, 10 Feb 2014 11:24:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtcy-0006h6-9Q for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:22:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCtcn-0007qU-Cf for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:22:36 -0500 Received: from mout.web.de ([212.227.17.11]:56543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtcm-0007pe-Tw for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:22:25 -0500 Received: from envy.com ([195.135.221.2]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0M7bQ3-1VJOpb0K6J-00xJSA for ; Mon, 10 Feb 2014 17:22:24 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 10 Feb 2014 17:22:18 +0100 Message-Id: <1392049338-23582-4-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1392049338-23582-1-git-send-email-andreas.faerber@web.de> References: <1392049338-23582-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:FW92/rVs/fvB7f/xslTjYt3Wrq9FFkWCMN37BfhAWHp4UzRmPfN GOlnhzKoFyI7CJSHwDzO6FXgT+Vf2vSNajiyNdDm7MpbXaveaezSfHm0qYcwjtd6OkW6v0Z OVovUfPnIUZZNdtsLJjDht0TPMzzg+I3916jh0a9izD83sFWbUY2H4SQzcGi3hlTeXLtMGu KbZ1YfvApdW0bd5OivuIA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.11 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Alexander Graf Subject: [Qemu-devel] [PULL 3/3] prep: Drop from ppcemb-softmmu 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 ppcemb covers only embedded processors, which does not include PReP. Signed-off-by: Andreas Färber --- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 5 ----- hw/ppc/Makefile.objs | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index f5cd0bd..f380ca4 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -41,6 +41,7 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y +CONFIG_PREP=y CONFIG_E500=y CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM)) # For PReP diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index fb34a9b..fcc0452 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -42,6 +42,7 @@ CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y CONFIG_PSERIES=y +CONFIG_PREP=y CONFIG_E500=y CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM)) # For pSeries diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 4411203..fdf1e14 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -10,11 +10,9 @@ CONFIG_VGA=y CONFIG_VGA_PCI=y CONFIG_SERIAL=y CONFIG_I8254=y -CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_I8257=y CONFIG_OPENPIC=y -CONFIG_PREP_PCI=y CONFIG_MACIO=y CONFIG_CUDA=y CONFIG_ADB=y @@ -38,6 +36,3 @@ CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y CONFIG_E500=y CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM)) -# For PReP -CONFIG_MC146818RTC=y -CONFIG_ISA_TESTDEV=y diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 7a1cd5d..2dd5284 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -8,7 +8,7 @@ obj-$(CONFIG_PSERIES) += spapr_pci.o obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o obj-y += ppc4xx_pci.o # PReP -obj-y += prep.o +obj-$(CONFIG_PREP) += prep.o # OldWorld PowerMac obj-y += mac_oldworld.o # NewWorld PowerMac