@@ -7059,19 +7059,6 @@ enum {
/* Freescale embedded PowerPC cores */
/* PowerPC MPC 5xx cores (aka RCPU) */
CPU_POWERPC_MPC5xx = 0x00020020,
-#define CPU_POWERPC_MGT560 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC509 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC533 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC534 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC555 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC556 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC560 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC561 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC562 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC563 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC564 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC565 CPU_POWERPC_MPC5xx
-#define CPU_POWERPC_MPC566 CPU_POWERPC_MPC5xx
/* PowerPC MPC 8xx cores (aka PowerQUICC) */
CPU_POWERPC_MPC8xx = 0x00500000,
#define CPU_POWERPC_MGT823 CPU_POWERPC_MPC8xx
@@ -8058,59 +8045,6 @@ static const ppc_def_t ppc_defs[] = {
/* Generic MPC5xx core */
POWERPC_DEF("MPC5xx", CPU_POWERPC_MPC5xx, MPC5xx)
#endif
- /* MPC5xx microcontrollers */
-#if defined(TODO_USER_ONLY)
- /* MGT560 */
- POWERPC_DEF("MGT560", CPU_POWERPC_MGT560, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC509 */
- POWERPC_DEF("MPC509", CPU_POWERPC_MPC509, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC533 */
- POWERPC_DEF("MPC533", CPU_POWERPC_MPC533, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC534 */
- POWERPC_DEF("MPC534", CPU_POWERPC_MPC534, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC555 */
- POWERPC_DEF("MPC555", CPU_POWERPC_MPC555, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC556 */
- POWERPC_DEF("MPC556", CPU_POWERPC_MPC556, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC560 */
- POWERPC_DEF("MPC560", CPU_POWERPC_MPC560, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC561 */
- POWERPC_DEF("MPC561", CPU_POWERPC_MPC561, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC562 */
- POWERPC_DEF("MPC562", CPU_POWERPC_MPC562, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC563 */
- POWERPC_DEF("MPC563", CPU_POWERPC_MPC563, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC564 */
- POWERPC_DEF("MPC564", CPU_POWERPC_MPC564, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC565 */
- POWERPC_DEF("MPC565", CPU_POWERPC_MPC565, MPC5xx)
-#endif
-#if defined(TODO_USER_ONLY)
- /* MPC566 */
- POWERPC_DEF("MPC566", CPU_POWERPC_MPC566, MPC5xx)
-#endif
/* MPC8xx family (aka PowerQUICC) */
#if defined(TODO_USER_ONLY)
/* Generic MPC8xx core */
@@ -9306,6 +9240,33 @@ typedef struct PowerPCCPUAlias {
static const PowerPCCPUAlias ppc_cpu_aliases[] = {
/* Codename for MPC5xx core */
{ "RCPU", "MPC5xx" },
+ /* MPC5xx microcontrollers */
+ /* MGT560 */
+ { "MGT560", "MPC5xx" },
+ /* MPC509 */
+ { "MPC509", "MPC5xx" },
+ /* MPC533 */
+ { "MPC533", "MPC5xx" },
+ /* MPC534 */
+ { "MPC534", "MPC5xx" },
+ /* MPC555 */
+ { "MPC555", "MPC5xx" },
+ /* MPC556 */
+ { "MPC556", "MPC5xx" },
+ /* MPC560 */
+ { "MPC560", "MPC5xx" },
+ /* MPC561 */
+ { "MPC561", "MPC5xx" },
+ /* MPC562 */
+ { "MPC562", "MPC5xx" },
+ /* MPC563 */
+ { "MPC563", "MPC5xx" },
+ /* MPC564 */
+ { "MPC564", "MPC5xx" },
+ /* MPC565 */
+ { "MPC565", "MPC5xx" },
+ /* MPC566 */
+ { "MPC566", "MPC5xx" },
/* Codename for MPC8xx core */
{ "PowerQUICC", "MPC8xx" },
/* Codename for MPC82xx */
Their PVR differed but was defined to MPC5xx. Signed-off-by: Andreas Färber <afaerber@suse.de> --- target-ppc/translate_init.c | 93 +++++++++++++------------------------------ 1 Datei geändert, 27 Zeilen hinzugefügt(+), 66 Zeilen entfernt(-)