Commit e3e414bc authored by Josh Boyer's avatar Josh Boyer

[POWERPC] Conditionally compile e200 and e500 platforms in cputable

The e200 and e500 platforms are separated in various parts of the kernel with
ifdefs, most notably reg_booke.h and traps.c.  The new machine_check rework
requires them to be similarly separated in cputable.c to avoid compile errors.
Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 8cb34d29
...@@ -1369,6 +1369,7 @@ static struct cpu_spec __initdata cpu_specs[] = { ...@@ -1369,6 +1369,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
}, },
#endif /* CONFIG_44x */ #endif /* CONFIG_44x */
#ifdef CONFIG_FSL_BOOKE #ifdef CONFIG_FSL_BOOKE
#ifdef CONFIG_E200
{ /* e200z5 */ { /* e200z5 */
.pvr_mask = 0xfff00000, .pvr_mask = 0xfff00000,
.pvr_value = 0x81000000, .pvr_value = 0x81000000,
...@@ -1396,6 +1397,7 @@ static struct cpu_spec __initdata cpu_specs[] = { ...@@ -1396,6 +1397,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
.machine_check = machine_check_e200, .machine_check = machine_check_e200,
.platform = "ppc5554", .platform = "ppc5554",
}, },
#elif defined(CONFIG_E500)
{ /* e500 */ { /* e500 */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
.pvr_value = 0x80200000, .pvr_value = 0x80200000,
...@@ -1432,6 +1434,7 @@ static struct cpu_spec __initdata cpu_specs[] = { ...@@ -1432,6 +1434,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
.platform = "ppc8548", .platform = "ppc8548",
}, },
#endif #endif
#endif
#if !CLASSIC_PPC #if !CLASSIC_PPC
{ /* default match */ { /* default match */
.pvr_mask = 0x00000000, .pvr_mask = 0x00000000,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment