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/Kconfig | |
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/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index b4ab3728653e..68b9b8fd9f85 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -1,14 +1,5 @@ | |||
1 | menu "Platform support" | 1 | menu "Platform support" |
2 | 2 | ||
3 | config PPC_MULTIPLATFORM | ||
4 | bool | ||
5 | depends on PPC64 || 6xx | ||
6 | default y | ||
7 | |||
8 | config CLASSIC32 | ||
9 | def_bool y | ||
10 | depends on 6xx && PPC_MULTIPLATFORM | ||
11 | |||
12 | source "arch/powerpc/platforms/pseries/Kconfig" | 3 | source "arch/powerpc/platforms/pseries/Kconfig" |
13 | source "arch/powerpc/platforms/iseries/Kconfig" | 4 | source "arch/powerpc/platforms/iseries/Kconfig" |
14 | source "arch/powerpc/platforms/chrp/Kconfig" | 5 | source "arch/powerpc/platforms/chrp/Kconfig" |
@@ -32,12 +23,24 @@ source "arch/powerpc/platforms/amigaone/Kconfig" | |||
32 | 23 | ||
33 | config PPC_NATIVE | 24 | config PPC_NATIVE |
34 | bool | 25 | bool |
35 | depends on PPC_MULTIPLATFORM | 26 | depends on 6xx || PPC64 |
36 | help | 27 | help |
37 | Support for running natively on the hardware, i.e. without | 28 | Support for running natively on the hardware, i.e. without |
38 | a hypervisor. This option is not user-selectable but should | 29 | a hypervisor. This option is not user-selectable but should |
39 | be selected by all platforms that need it. | 30 | be selected by all platforms that need it. |
40 | 31 | ||
32 | config PPC_OF_BOOT_TRAMPOLINE | ||
33 | bool "Support booting from Open Firmware or yaboot" | ||
34 | depends on 6xx || PPC64 | ||
35 | default y | ||
36 | help | ||
37 | Support from booting from Open Firmware or yaboot using an | ||
38 | Open Firmware client interface. This enables the kernel to | ||
39 | communicate with open firmware to retrieve system informations | ||
40 | such as the device tree. | ||
41 | |||
42 | In case of doubt, say Y | ||
43 | |||
41 | config UDBG_RTAS_CONSOLE | 44 | config UDBG_RTAS_CONSOLE |
42 | bool "RTAS based debug console" | 45 | bool "RTAS based debug console" |
43 | depends on PPC_RTAS | 46 | depends on PPC_RTAS |
@@ -71,7 +74,7 @@ config PPC_I8259 | |||
71 | 74 | ||
72 | config U3_DART | 75 | config U3_DART |
73 | bool | 76 | bool |
74 | depends on PPC_MULTIPLATFORM && PPC64 | 77 | depends on PPC64 |
75 | default n | 78 | default n |
76 | 79 | ||
77 | config PPC_RTAS | 80 | config PPC_RTAS |
@@ -188,7 +191,7 @@ config PPC601_SYNC_FIX | |||
188 | 191 | ||
189 | config TAU | 192 | config TAU |
190 | bool "On-chip CPU temperature sensor support" | 193 | bool "On-chip CPU temperature sensor support" |
191 | depends on CLASSIC32 | 194 | depends on 6xx |
192 | help | 195 | help |
193 | G3 and G4 processors have an on-chip temperature sensor called the | 196 | G3 and G4 processors have an on-chip temperature sensor called the |
194 | 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die | 197 | 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die |