diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-10 13:53:27 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:11:35 -0400 |
| commit | 28794d34ecb6815a3fa0a4256027c9b081a17c5f (patch) | |
| tree | b75cba61f2d41b07d09ade4a72e4aba80fd73a31 /arch/powerpc/platforms/prep | |
| parent | 9e5efaa9360f26e0052d16f7a40d002a6a18863b (diff) | |
powerpc/kconfig: Kill PPC_MULTIPLATFORM
CONFIG_PPC_MULTIPLATFORM is a remain of the pre-powerpc days and isn't
really meaningful anymore. It was basically equivalent to PPC64 || 6xx.
This removes it along with the following changes:
- 32-bit platforms that relied on PPC32 && PPC_MULTIPLATFORM now rely
on 6xx which is what they want anyway.
- A new symbol, PPC_BOOK3S, is defined that represent compliance with
the "Server" variant of the architecture. This is set when either 6xx
or PPC64 is set and open the door for future BOOK3E 64-bit.
- 64-bit platforms that relied on PPC64 && PPC_MULTIPLATFORM now use
PPC64 && PPC_BOOK3S
- A separate and selectable CONFIG_PPC_OF_BOOT_TRAMPOLINE option is now
used to control the use of prom_init.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/prep')
| -rw-r--r-- | arch/powerpc/platforms/prep/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/prep/Kconfig b/arch/powerpc/platforms/prep/Kconfig index 29d411279b0..bf8330ef2e7 100644 --- a/arch/powerpc/platforms/prep/Kconfig +++ b/arch/powerpc/platforms/prep/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config PPC_PREP | 1 | config PPC_PREP |
| 2 | bool "PowerPC Reference Platform (PReP) based machines" | 2 | bool "PowerPC Reference Platform (PReP) based machines" |
| 3 | depends on PPC_MULTIPLATFORM && PPC32 && BROKEN | 3 | depends on 6xx && BROKEN |
| 4 | select MPIC | 4 | select MPIC |
| 5 | select PPC_I8259 | 5 | select PPC_I8259 |
| 6 | select PPC_INDIRECT_PCI | 6 | select PPC_INDIRECT_PCI |