Signed-off-by: Andreas Färber <afaer...@suse.de>
---
target-ppc/translate_init.c | 7 ++-----
1 Datei geändert, 2 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 7799372..abe9557 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -7039,7 +7039,6 @@ enum {
CPU_POWERPC_G2LEgp3 = 0x80822013,
/* MPC52xx microcontrollers */
/* XXX: MPC 5121 ? */
-#define CPU_POWERPC_MPC52xx CPU_POWERPC_MPC5200
#define CPU_POWERPC_MPC5200 CPU_POWERPC_MPC5200_v12
#define CPU_POWERPC_MPC5200_v10 CPU_POWERPC_G2LEgp1
#define CPU_POWERPC_MPC5200_v11 CPU_POWERPC_G2LEgp1
@@ -7366,7 +7365,6 @@ enum {
/* System version register (used on MPC 8xxx) */
enum {
POWERPC_SVR_NONE = 0x00000000,
-#define POWERPC_SVR_52xx POWERPC_SVR_5200
#define POWERPC_SVR_5200 POWERPC_SVR_5200_v12
POWERPC_SVR_5200_v10 = 0x80110010,
POWERPC_SVR_5200_v11 = 0x80110011,
@@ -7883,9 +7881,6 @@ static const ppc_def_t ppc_defs[] = {
POWERPC_DEF("MPC8xx", CPU_POWERPC_MPC8xx, MPC8xx)
#endif
/* MPC82xx family (aka PowerQUICC-II) */
- /* Generic MPC52xx core */
- POWERPC_DEF_SVR("MPC52xx",
- CPU_POWERPC_MPC52xx, POWERPC_SVR_52xx, G2LE)
/* PowerPC G2 core */
POWERPC_DEF("G2", CPU_POWERPC_G2, G2)
/* PowerPC G2 H4 core */
@@ -8903,6 +8898,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = {
/* MPC885 */
{ "MPC885", "MPC8xx" },
+ { "MPC52xx", "MPC5200" },
+
{ "MPC82xx", "MPC8280" },
/* Codename for MPC82xx */
{ "PowerQUICC-II", "MPC82xx" },
--
1.7.10.4
