From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6KtM-0004ks-B9 for qemu-devel@nongnu.org; Thu, 23 Jan 2014 09:04:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6KtD-0005nT-Lr for qemu-devel@nongnu.org; Thu, 23 Jan 2014 09:04:24 -0500 Received: from mout.web.de ([212.227.15.3]:52739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6KtD-0005lR-AE for qemu-devel@nongnu.org; Thu, 23 Jan 2014 09:04:15 -0500 Received: from envy.com ([195.135.221.2]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0Lmu2K-1Vf0Ph11uG-00h8zs for ; Thu, 23 Jan 2014 15:04:13 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 23 Jan 2014 15:04:05 +0100 Message-Id: <1390485845-20474-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] prep: Drop from ppcemb-softmmu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:PowerPC" , armbru@redhat.com, Alexander Graf 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 -- 1.8.4