From patchwork Tue Feb 12 10:13:23 2013 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: 219822 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 48EB92C0328 for ; Tue, 12 Feb 2013 22:47:27 +1100 (EST) Received: from localhost ([::1]:37185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5EKb-0005Ew-EI for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 06:47:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Csh-0005T6-Tw for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5CsW-0003Wx-Kj for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:31 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42811 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsW-0003Wd-9e; Tue, 12 Feb 2013 05:14:20 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id C18A0A520C; Tue, 12 Feb 2013 11:14:19 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:23 +0100 Message-Id: <1360664012-16824-31-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360664012-16824-1-git-send-email-afaerber@suse.de> References: <1360664012-16824-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH ppc-next 30/39] target-ppc: Extract MPC82xx aliases to *_HiP4 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: Andreas Färber --- target-ppc/translate_init.c | 24 ++++++------------------ 1 Datei geändert, 6 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index ea512bd..42e1f2d 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7051,22 +7051,16 @@ enum { #define CPU_POWERPC_MPC8240 CPU_POWERPC_MPC603 #define CPU_POWERPC_MPC8241 CPU_POWERPC_G2_HIP4 #define CPU_POWERPC_MPC8245 CPU_POWERPC_G2_HIP4 -#define CPU_POWERPC_MPC8250 CPU_POWERPC_MPC8250_HiP4 #define CPU_POWERPC_MPC8250_HiP3 CPU_POWERPC_G2_HIP3 #define CPU_POWERPC_MPC8250_HiP4 CPU_POWERPC_G2_HIP4 -#define CPU_POWERPC_MPC8255 CPU_POWERPC_MPC8255_HiP4 #define CPU_POWERPC_MPC8255_HiP3 CPU_POWERPC_G2_HIP3 #define CPU_POWERPC_MPC8255_HiP4 CPU_POWERPC_G2_HIP4 -#define CPU_POWERPC_MPC8260 CPU_POWERPC_MPC8260_HiP4 #define CPU_POWERPC_MPC8260_HiP3 CPU_POWERPC_G2_HIP3 #define CPU_POWERPC_MPC8260_HiP4 CPU_POWERPC_G2_HIP4 -#define CPU_POWERPC_MPC8264 CPU_POWERPC_MPC8264_HiP4 #define CPU_POWERPC_MPC8264_HiP3 CPU_POWERPC_G2_HIP3 #define CPU_POWERPC_MPC8264_HiP4 CPU_POWERPC_G2_HIP4 -#define CPU_POWERPC_MPC8265 CPU_POWERPC_MPC8265_HiP4 #define CPU_POWERPC_MPC8265_HiP3 CPU_POWERPC_G2_HIP3 #define CPU_POWERPC_MPC8265_HiP4 CPU_POWERPC_G2_HIP4 -#define CPU_POWERPC_MPC8266 CPU_POWERPC_MPC8266_HiP4 #define CPU_POWERPC_MPC8266_HiP3 CPU_POWERPC_G2_HIP3 #define CPU_POWERPC_MPC8266_HiP4 CPU_POWERPC_G2_HIP4 /* e200 family */ @@ -7964,38 +7958,26 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("MPC8241", CPU_POWERPC_MPC8241, G2) /* MPC8245 */ POWERPC_DEF("MPC8245", CPU_POWERPC_MPC8245, G2) - /* MPC8250 */ - POWERPC_DEF("MPC8250", CPU_POWERPC_MPC8250, G2) /* MPC8250 HiP3 */ POWERPC_DEF("MPC8250_HiP3", CPU_POWERPC_MPC8250_HiP3, G2) /* MPC8250 HiP4 */ POWERPC_DEF("MPC8250_HiP4", CPU_POWERPC_MPC8250_HiP4, G2) - /* MPC8255 */ - POWERPC_DEF("MPC8255", CPU_POWERPC_MPC8255, G2) /* MPC8255 HiP3 */ POWERPC_DEF("MPC8255_HiP3", CPU_POWERPC_MPC8255_HiP3, G2) /* MPC8255 HiP4 */ POWERPC_DEF("MPC8255_HiP4", CPU_POWERPC_MPC8255_HiP4, G2) - /* MPC8260 */ - POWERPC_DEF("MPC8260", CPU_POWERPC_MPC8260, G2) /* MPC8260 HiP3 */ POWERPC_DEF("MPC8260_HiP3", CPU_POWERPC_MPC8260_HiP3, G2) /* MPC8260 HiP4 */ POWERPC_DEF("MPC8260_HiP4", CPU_POWERPC_MPC8260_HiP4, G2) - /* MPC8264 */ - POWERPC_DEF("MPC8264", CPU_POWERPC_MPC8264, G2) /* MPC8264 HiP3 */ POWERPC_DEF("MPC8264_HiP3", CPU_POWERPC_MPC8264_HiP3, G2) /* MPC8264 HiP4 */ POWERPC_DEF("MPC8264_HiP4", CPU_POWERPC_MPC8264_HiP4, G2) - /* MPC8265 */ - POWERPC_DEF("MPC8265", CPU_POWERPC_MPC8265, G2) /* MPC8265 HiP3 */ POWERPC_DEF("MPC8265_HiP3", CPU_POWERPC_MPC8265_HiP3, G2) /* MPC8265 HiP4 */ POWERPC_DEF("MPC8265_HiP4", CPU_POWERPC_MPC8265_HiP4, G2) - /* MPC8266 */ - POWERPC_DEF("MPC8266", CPU_POWERPC_MPC8266, G2) /* MPC8266 HiP3 */ POWERPC_DEF("MPC8266_HiP3", CPU_POWERPC_MPC8266_HiP3, G2) /* MPC8266 HiP4 */ @@ -8968,6 +8950,12 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "PowerQUICC-II", "MPC82xx" }, { "MPC8247", "G2leGP3" }, { "MPC8248", "G2leGP3" }, + { "MPC8250", "MPC8250_HiP4" }, + { "MPC8255", "MPC8255_HiP4" }, + { "MPC8260", "MPC8260_HiP4" }, + { "MPC8264", "MPC8264_HiP4" }, + { "MPC8265", "MPC8265_HiP4" }, + { "MPC8266", "MPC8266_HiP4" }, /* MPC8270 */ { "MPC8270", "G2leGP3" }, /* MPC8271 */