diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-10 17:53:27 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 17:11:35 +1100 |
| commit | 28794d34ecb6815a3fa0a4256027c9b081a17c5f (patch) | |
| tree | b75cba61f2d41b07d09ade4a72e4aba80fd73a31 /arch/powerpc/platforms/pseries/Kconfig | |
| parent | 9e5efaa9360f26e0052d16f7a40d002a6a18863b (diff) | |
| download | talos-obmc-linux-28794d34ecb6815a3fa0a4256027c9b081a17c5f.tar.gz talos-obmc-linux-28794d34ecb6815a3fa0a4256027c9b081a17c5f.zip | |
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/pseries/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 095ff6f846b9..c0e6ec240f46 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -1,5 +1,5 @@ config PPC_PSERIES - depends on PPC_MULTIPLATFORM && PPC64 + depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" select MPIC select PPC_I8259 |
