Commit 13fef7f9 authored by Michael Ellerman's avatar Michael Ellerman

powerpc/47x: Guard 47x cputable entries with CONFIG_PPC_47x

Currently we build the 47x cputable entries even when CONFIG_PPC_47x is
disabled. That means a kernel built without CONFIG_PPC_47x will claim to
support a 47x CPU and start booting, only to break somewhere later
because it doesn't have 47x support compiled in.

So guard the 47x cputable entries with CONFIG_PPC_47x. Note that this is
inside the #ifdef CONFIG_44x section, because 47x depends on 44x.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent bf957155
...@@ -1936,6 +1936,7 @@ static struct cpu_spec __initdata cpu_specs[] = { ...@@ -1936,6 +1936,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
.machine_check = machine_check_440A, .machine_check = machine_check_440A,
.platform = "ppc440", .platform = "ppc440",
}, },
#ifdef CONFIG_PPC_47x
{ /* 476 DD2 core */ { /* 476 DD2 core */
.pvr_mask = 0xffffffff, .pvr_mask = 0xffffffff,
.pvr_value = 0x11a52080, .pvr_value = 0x11a52080,
...@@ -1992,6 +1993,7 @@ static struct cpu_spec __initdata cpu_specs[] = { ...@@ -1992,6 +1993,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
.machine_check = machine_check_47x, .machine_check = machine_check_47x,
.platform = "ppc470", .platform = "ppc470",
}, },
#endif /* CONFIG_PPC_47x */
{ /* default match */ { /* default match */
.pvr_mask = 0x00000000, .pvr_mask = 0x00000000,
.pvr_value = 0x00000000, .pvr_value = 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