From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCvjH-0004jU-F7 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCvj9-0005oX-Hy for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:15 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 10 Feb 2014 19:36:19 +0100 Message-Id: <1392057426-31990-3-git-send-email-afaerber@suse.de> In-Reply-To: <1392057426-31990-1-git-send-email-afaerber@suse.de> References: <1392057426-31990-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 02/48] 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" , Alexander Graf From: Andreas F=C3=A4rber ppcemb covers only embedded processors, which does not include PReP. Signed-off-by: Andreas F=C3=A4rber --- 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-softmm= u.mak index f5cd0bd..f380ca4 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -41,6 +41,7 @@ CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_OPENPIC=3Dy +CONFIG_PREP=3Dy CONFIG_E500=3Dy CONFIG_OPENPIC_KVM=3D$(and $(CONFIG_E500),$(CONFIG_KVM)) # For PReP diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-so= ftmmu.mak index fb34a9b..fcc0452 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -42,6 +42,7 @@ CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_OPENPIC=3Dy CONFIG_PSERIES=3Dy +CONFIG_PREP=3Dy CONFIG_E500=3Dy CONFIG_OPENPIC_KVM=3D$(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=3Dy CONFIG_VGA_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_I8254=3Dy -CONFIG_PCKBD=3Dy CONFIG_FDC=3Dy CONFIG_I8257=3Dy CONFIG_OPENPIC=3Dy -CONFIG_PREP_PCI=3Dy CONFIG_MACIO=3Dy CONFIG_CUDA=3Dy CONFIG_ADB=3Dy @@ -38,6 +36,3 @@ CONFIG_XILINX_ETHLITE=3Dy CONFIG_OPENPIC=3Dy CONFIG_E500=3Dy CONFIG_OPENPIC_KVM=3D$(and $(CONFIG_E500),$(CONFIG_KVM)) -# For PReP -CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy 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) +=3D spapr_pci.o obj-y +=3D ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o obj-y +=3D ppc4xx_pci.o # PReP -obj-y +=3D prep.o +obj-$(CONFIG_PREP) +=3D prep.o # OldWorld PowerMac obj-y +=3D mac_oldworld.o # NewWorld PowerMac --=20 1.8.4.5