From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcf-00026i-Q0 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWcZ-0005mw-Mw for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:09 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:12 +0100 Message-Id: <1392675899-21210-3-git-send-email-afaerber@suse.de> In-Reply-To: <1392675899-21210-1-git-send-email-afaerber@suse.de> References: <1392675899-21210-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 v2 02/49] ppcemb-softmmu: Drop Mac and e500 emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf They are still available in ppc-softmmu and ppc64-softmmu. Signed-off-by: Andreas F=C3=A4rber --- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 20 -------------------- hw/ppc/Makefile.objs | 4 ++-- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmm= u.mak index f380ca4..e5f9d36 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -42,6 +42,7 @@ CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_OPENPIC=3Dy CONFIG_PREP=3Dy +CONFIG_MAC=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 fcc0452..e2beac6 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -43,6 +43,7 @@ CONFIG_XILINX_ETHLITE=3Dy CONFIG_OPENPIC=3Dy CONFIG_PSERIES=3Dy CONFIG_PREP=3Dy +CONFIG_MAC=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 fdf1e14..1e4fde2 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -3,30 +3,12 @@ include pci.mak include sound.mak include usb.mak -CONFIG_ISA_MMIO=3Dy -CONFIG_ESCC=3Dy CONFIG_M48T59=3Dy CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy CONFIG_SERIAL=3Dy -CONFIG_I8254=3Dy -CONFIG_FDC=3Dy CONFIG_I8257=3Dy CONFIG_OPENPIC=3Dy -CONFIG_MACIO=3Dy -CONFIG_CUDA=3Dy -CONFIG_ADB=3Dy -CONFIG_MAC_NVRAM=3Dy -CONFIG_MAC_DBDMA=3Dy -CONFIG_HEATHROW_PIC=3Dy -CONFIG_GRACKLE_PCI=3Dy -CONFIG_UNIN_PCI=3Dy -CONFIG_DEC_PCI=3Dy -CONFIG_PPCE500_PCI=3Dy -CONFIG_IDE_ISA=3Dy -CONFIG_IDE_CMD646=3Dy -CONFIG_IDE_MACIO=3Dy -CONFIG_NE2000_ISA=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_PTIMER=3Dy @@ -34,5 +16,3 @@ CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_OPENPIC=3Dy -CONFIG_E500=3Dy -CONFIG_OPENPIC_KVM=3D$(and $(CONFIG_E500),$(CONFIG_KVM)) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 2dd5284..ea747f0 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -10,9 +10,9 @@ obj-y +=3D ppc4xx_pci.o # PReP obj-$(CONFIG_PREP) +=3D prep.o # OldWorld PowerMac -obj-y +=3D mac_oldworld.o +obj-$(CONFIG_MAC) +=3D mac_oldworld.o # NewWorld PowerMac -obj-y +=3D mac_newworld.o +obj-$(CONFIG_MAC) +=3D mac_newworld.o # e500 obj-$(CONFIG_E500) +=3D e500.o mpc8544ds.o e500plat.o obj-$(CONFIG_E500) +=3D mpc8544_guts.o ppce500_spin.o --=20 1.8.4.5