From nobody Thu May 2 10:09:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505857333621130.3916853632535; Tue, 19 Sep 2017 14:42:13 -0700 (PDT) Received: from localhost ([::1]:45583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duQHT-0000og-EH for importer@patchew.org; Tue, 19 Sep 2017 17:42:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duQBn-000533-Lj for qemu-devel@nongnu.org; Tue, 19 Sep 2017 17:36:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duQBk-0003kb-8F for qemu-devel@nongnu.org; Tue, 19 Sep 2017 17:36:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duQBk-0003k5-3Z for qemu-devel@nongnu.org; Tue, 19 Sep 2017 17:36:16 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 219F47E42A; Tue, 19 Sep 2017 21:36:15 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E55560619; Tue, 19 Sep 2017 21:36:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 219F47E42A Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jsnow@redhat.com From: John Snow To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 17:36:10 -0400 Message-Id: <20170919213611.8988-2-jsnow@redhat.com> In-Reply-To: <20170919213611.8988-1-jsnow@redhat.com> References: <20170919213611.8988-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 19 Sep 2017 21:36:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: imammedo@redhat.com, thuth@redhat.com, John Snow , agraf@suse.de, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Following commit aef77960, remove now-unused definitions from cpu-models.h. Signed-off-by: John Snow Reviewed-by: Thomas Huth --- target/ppc/cpu-models.h | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h index df31d7f..b34b512 100644 --- a/target/ppc/cpu-models.h +++ b/target/ppc/cpu-models.h @@ -291,34 +291,6 @@ enum { #endif CPU_POWERPC_e200z5 =3D 0x81000000, CPU_POWERPC_e200z6 =3D 0x81120000, - /* MPC55xx microcontrollers */ -#define CPU_POWERPC_MPC55xx CPU_POWERPC_MPC5567 -#if 0 -#define CPU_POWERPC_MPC5514E CPU_POWERPC_MPC5514E_v1 -#define CPU_POWERPC_MPC5514E_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5514E_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5514G CPU_POWERPC_MPC5514G_v1 -#define CPU_POWERPC_MPC5514G_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5514G_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5515S CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5516E CPU_POWERPC_MPC5516E_v1 -#define CPU_POWERPC_MPC5516E_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5516E_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5516G CPU_POWERPC_MPC5516G_v1 -#define CPU_POWERPC_MPC5516G_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5516G_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5516S CPU_POWERPC_e200z1 -#endif -#if 0 -#define CPU_POWERPC_MPC5533 CPU_POWERPC_e200z3 -#define CPU_POWERPC_MPC5534 CPU_POWERPC_e200z3 -#endif -#define CPU_POWERPC_MPC5553 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5554 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5561 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5565 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5566 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5567 CPU_POWERPC_e200z6 /* e300 family */ /* e300 cores */ CPU_POWERPC_e300c1 =3D 0x00830010, @@ -326,11 +298,7 @@ enum { CPU_POWERPC_e300c3 =3D 0x00850010, CPU_POWERPC_e300c4 =3D 0x00860010, /* MPC83xx microcontrollers */ -#define CPU_POWERPC_MPC831x CPU_POWERPC_e300c3 -#define CPU_POWERPC_MPC832x CPU_POWERPC_e300c2 #define CPU_POWERPC_MPC834x CPU_POWERPC_e300c1 -#define CPU_POWERPC_MPC835x CPU_POWERPC_e300c1 -#define CPU_POWERPC_MPC836x CPU_POWERPC_e300c1 #define CPU_POWERPC_MPC837x CPU_POWERPC_e300c4 /* e500 family */ /* e500 cores */ --=20 2.9.5 From nobody Thu May 2 10:09:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505857084234977.2196323253344; Tue, 19 Sep 2017 14:38:04 -0700 (PDT) Received: from localhost ([::1]:45559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duQDT-00069J-BJ for importer@patchew.org; Tue, 19 Sep 2017 17:38:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duQBn-000535-ND for qemu-devel@nongnu.org; Tue, 19 Sep 2017 17:36:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duQBl-0003l7-E6 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 17:36:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52510) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duQBl-0003kr-5V for qemu-devel@nongnu.org; Tue, 19 Sep 2017 17:36:17 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3547E81DF5; Tue, 19 Sep 2017 21:36:16 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43EA46060A; Tue, 19 Sep 2017 21:36:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3547E81DF5 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jsnow@redhat.com From: John Snow To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 17:36:11 -0400 Message-Id: <20170919213611.8988-3-jsnow@redhat.com> In-Reply-To: <20170919213611.8988-1-jsnow@redhat.com> References: <20170919213611.8988-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Sep 2017 21:36:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] ppc: remove all unused CPU definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: imammedo@redhat.com, thuth@redhat.com, John Snow , agraf@suse.de, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove *all* unused CPU definitions as indicated by compile-time `#if 0` constructs. Signed-off-by: John Snow Reviewed-by: Thomas Huth --- target/ppc/cpu-models.h | 223 --------------------------------------------= ---- 1 file changed, 223 deletions(-) diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h index b34b512..248f833 100644 --- a/target/ppc/cpu-models.h +++ b/target/ppc/cpu-models.h @@ -44,184 +44,55 @@ enum { /* PowerPC 401 cores */ CPU_POWERPC_401A1 =3D 0x00210000, CPU_POWERPC_401B2 =3D 0x00220000, -#if 0 - CPU_POWERPC_401B3 =3D xxx, -#endif CPU_POWERPC_401C2 =3D 0x00230000, CPU_POWERPC_401D2 =3D 0x00240000, CPU_POWERPC_401E2 =3D 0x00250000, CPU_POWERPC_401F2 =3D 0x00260000, CPU_POWERPC_401G2 =3D 0x00270000, /* PowerPC 401 microcontrolers */ -#if 0 - CPU_POWERPC_401GF =3D xxx, -#endif #define CPU_POWERPC_IOP480 CPU_POWERPC_401B2 /* IBM Processor for Network Resources */ CPU_POWERPC_COBRA =3D 0x10100000, /* XXX: 405 ? */ -#if 0 - CPU_POWERPC_XIPCHIP =3D xxx, -#endif /* PowerPC 403 family */ /* PowerPC 403 microcontrollers */ CPU_POWERPC_403GA =3D 0x00200011, CPU_POWERPC_403GB =3D 0x00200100, CPU_POWERPC_403GC =3D 0x00200200, CPU_POWERPC_403GCX =3D 0x00201400, -#if 0 - CPU_POWERPC_403GP =3D xxx, -#endif /* PowerPC 405 family */ /* PowerPC 405 cores */ -#if 0 - CPU_POWERPC_405A3 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405A4 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405B3 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405B4 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405C3 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405C4 =3D xxx, -#endif CPU_POWERPC_405D2 =3D 0x20010000, -#if 0 - CPU_POWERPC_405D3 =3D xxx, -#endif CPU_POWERPC_405D4 =3D 0x41810000, -#if 0 - CPU_POWERPC_405D5 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405E4 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405F4 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405F5 =3D xxx, -#endif -#if 0 - CPU_POWERPC_405F6 =3D xxx, -#endif /* PowerPC 405 microcontrolers */ /* XXX: missing 0x200108a0 */ CPU_POWERPC_405CRa =3D 0x40110041, CPU_POWERPC_405CRb =3D 0x401100C5, CPU_POWERPC_405CRc =3D 0x40110145, CPU_POWERPC_405EP =3D 0x51210950, -#if 0 - CPU_POWERPC_405EXr =3D xxx, -#endif CPU_POWERPC_405EZ =3D 0x41511460, /* 0x51210950 ? */ -#if 0 - CPU_POWERPC_405FX =3D xxx, -#endif CPU_POWERPC_405GPa =3D 0x40110000, CPU_POWERPC_405GPb =3D 0x40110040, CPU_POWERPC_405GPc =3D 0x40110082, CPU_POWERPC_405GPd =3D 0x401100C4, CPU_POWERPC_405GPR =3D 0x50910951, -#if 0 - CPU_POWERPC_405H =3D xxx, -#endif -#if 0 - CPU_POWERPC_405L =3D xxx, -#endif CPU_POWERPC_405LP =3D 0x41F10000, -#if 0 - CPU_POWERPC_405PM =3D xxx, -#endif -#if 0 - CPU_POWERPC_405PS =3D xxx, -#endif -#if 0 - CPU_POWERPC_405S =3D xxx, -#endif /* IBM network processors */ CPU_POWERPC_NPE405H =3D 0x414100C0, CPU_POWERPC_NPE405H2 =3D 0x41410140, CPU_POWERPC_NPE405L =3D 0x416100C0, CPU_POWERPC_NPE4GS3 =3D 0x40B10000, -#if 0 - CPU_POWERPC_NPCxx1 =3D xxx, -#endif -#if 0 - CPU_POWERPC_NPR161 =3D xxx, -#endif -#if 0 - CPU_POWERPC_LC77700 =3D xxx, -#endif /* IBM STBxxx (PowerPC 401/403/405 core based microcontrollers) */ -#if 0 - CPU_POWERPC_STB01000 =3D xxx, -#endif -#if 0 - CPU_POWERPC_STB01010 =3D xxx, -#endif -#if 0 - CPU_POWERPC_STB0210 =3D xxx, /* 401B3 */ -#endif CPU_POWERPC_STB03 =3D 0x40310000, /* 0x40130000 ? */ -#if 0 - CPU_POWERPC_STB043 =3D xxx, -#endif -#if 0 - CPU_POWERPC_STB045 =3D xxx, -#endif CPU_POWERPC_STB04 =3D 0x41810000, CPU_POWERPC_STB25 =3D 0x51510950, -#if 0 - CPU_POWERPC_STB130 =3D xxx, -#endif /* Xilinx cores */ CPU_POWERPC_X2VP4 =3D 0x20010820, CPU_POWERPC_X2VP20 =3D 0x20010860, -#if 0 - CPU_POWERPC_ZL10310 =3D xxx, -#endif -#if 0 - CPU_POWERPC_ZL10311 =3D xxx, -#endif -#if 0 - CPU_POWERPC_ZL10320 =3D xxx, -#endif -#if 0 - CPU_POWERPC_ZL10321 =3D xxx, -#endif /* PowerPC 440 family */ /* Generic PowerPC 440 */ #define CPU_POWERPC_440 CPU_POWERPC_440GXf /* PowerPC 440 cores */ -#if 0 - CPU_POWERPC_440A4 =3D xxx, -#endif CPU_POWERPC_440_XILINX =3D 0x7ff21910, -#if 0 - CPU_POWERPC_440A5 =3D xxx, -#endif -#if 0 - CPU_POWERPC_440B4 =3D xxx, -#endif -#if 0 - CPU_POWERPC_440F5 =3D xxx, -#endif -#if 0 - CPU_POWERPC_440G5 =3D xxx, -#endif -#if 0 - CPU_POWERPC_440H4 =3D xxx, -#endif -#if 0 - CPU_POWERPC_440H6 =3D xxx, -#endif /* PowerPC 440 microcontrolers */ CPU_POWERPC_440EPa =3D 0x42221850, CPU_POWERPC_440EPb =3D 0x422218D3, @@ -234,24 +105,11 @@ enum { CPU_POWERPC_440GXb =3D 0x51B21851, CPU_POWERPC_440GXc =3D 0x51B21892, CPU_POWERPC_440GXf =3D 0x51B21894, -#if 0 - CPU_POWERPC_440S =3D xxx, -#endif CPU_POWERPC_440SP =3D 0x53221850, CPU_POWERPC_440SP2 =3D 0x53221891, CPU_POWERPC_440SPE =3D 0x53421890, /* PowerPC 460 family */ -#if 0 - /* Generic PowerPC 464 */ -#define CPU_POWERPC_464 CPU_POWERPC_464H90 -#endif /* PowerPC 464 microcontrolers */ -#if 0 - CPU_POWERPC_464H90 =3D xxx, -#endif -#if 0 - CPU_POWERPC_464H90FP =3D xxx, -#endif /* Freescale embedded PowerPC cores */ /* PowerPC MPC 5xx cores (aka RCPU) */ CPU_POWERPC_MPC5xx =3D 0x00020020, @@ -280,15 +138,6 @@ enum { #define CPU_POWERPC_MPC5200B_v21 CPU_POWERPC_G2LEgp1 /* e200 family */ /* e200 cores */ -#if 0 - CPU_POWERPC_e200z0 =3D xxx, -#endif -#if 0 - CPU_POWERPC_e200z1 =3D xxx, -#endif -#if 0 /* ? */ - CPU_POWERPC_e200z3 =3D 0x81120000, -#endif CPU_POWERPC_e200z5 =3D 0x81000000, CPU_POWERPC_e200z6 =3D 0x81120000, /* e300 family */ @@ -406,9 +255,6 @@ enum { /* XXX: missing 0x000a0100 */ /* XXX: missing 0x00093102 */ CPU_POWERPC_604R =3D 0x000a0101, -#if 0 - CPU_POWERPC_604EV =3D xxx, /* XXX: same as 604R ? */ -#endif /* PowerPC 740/750 cores (aka G3) */ /* XXX: missing 0x00084202 */ CPU_POWERPC_7x0_v10 =3D 0x00080100, @@ -463,9 +309,6 @@ enum { CPU_POWERPC_7x5_v26 =3D 0x00083206, CPU_POWERPC_7x5_v27 =3D 0x00083207, CPU_POWERPC_7x5_v28 =3D 0x00083208, -#if 0 - CPU_POWERPC_7x5P =3D xxx, -#endif /* PowerPC 74xx cores (aka G4) */ /* XXX: missing 0x000C1101 */ CPU_POWERPC_7400_v10 =3D 0x000C0100, @@ -553,12 +396,6 @@ enum { /* XXX: should be POWER (RIOS), RSC3308, RSC4608, * POWER2 (RIOS2) & RSC2 (P2SC) here */ -#if 0 - CPU_POWER =3D xxx, /* 0x20000 ? 0x30000 for RSC ?= */ -#endif -#if 0 - CPU_POWER2 =3D xxx, /* 0x40000 ? */ -#endif /* PA Semi core */ CPU_POWERPC_PA6T =3D 0x00900000, }; @@ -582,60 +419,6 @@ enum { POWERPC_SVR_5200B_v20 =3D 0x80110020, POWERPC_SVR_5200B_v21 =3D 0x80110021, #define POWERPC_SVR_55xx POWERPC_SVR_5567 -#if 0 - POWERPC_SVR_5533 =3D xxx, -#endif -#if 0 - POWERPC_SVR_5534 =3D xxx, -#endif -#if 0 - POWERPC_SVR_5553 =3D xxx, -#endif -#if 0 - POWERPC_SVR_5554 =3D xxx, -#endif -#if 0 - POWERPC_SVR_5561 =3D xxx, -#endif -#if 0 - POWERPC_SVR_5565 =3D xxx, -#endif -#if 0 - POWERPC_SVR_5566 =3D xxx, -#endif -#if 0 - POWERPC_SVR_5567 =3D xxx, -#endif -#if 0 - POWERPC_SVR_8313 =3D xxx, -#endif -#if 0 - POWERPC_SVR_8313E =3D xxx, -#endif -#if 0 - POWERPC_SVR_8314 =3D xxx, -#endif -#if 0 - POWERPC_SVR_8314E =3D xxx, -#endif -#if 0 - POWERPC_SVR_8315 =3D xxx, -#endif -#if 0 - POWERPC_SVR_8315E =3D xxx, -#endif -#if 0 - POWERPC_SVR_8321 =3D xxx, -#endif -#if 0 - POWERPC_SVR_8321E =3D xxx, -#endif -#if 0 - POWERPC_SVR_8323 =3D xxx, -#endif -#if 0 - POWERPC_SVR_8323E =3D xxx, -#endif POWERPC_SVR_8343 =3D 0x80570010, POWERPC_SVR_8343A =3D 0x80570030, POWERPC_SVR_8343E =3D 0x80560010, @@ -652,12 +435,6 @@ enum { POWERPC_SVR_8349A =3D 0x80510030, POWERPC_SVR_8349E =3D 0x80500010, POWERPC_SVR_8349EA =3D 0x80500030, -#if 0 - POWERPC_SVR_8358E =3D xxx, -#endif -#if 0 - POWERPC_SVR_8360E =3D xxx, -#endif #define POWERPC_SVR_E500 0x40000000 POWERPC_SVR_8377 =3D 0x80C70010 | POWERPC_SVR_E500, POWERPC_SVR_8377E =3D 0x80C60010 | POWERPC_SVR_E500, --=20 2.9.5