diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-07-23 19:15:59 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-19 20:25:11 -0400 |
commit | 2d27cfd3286966c04d4192a9db5a6c7ea60eebf1 (patch) | |
tree | a9e3feb764da5a2be1a6ef9b3a0bf694e874a424 /arch/powerpc/platforms | |
parent | 32a74949b7337726e76d69f51c48715431126c6c (diff) |
powerpc: Remaining 64-bit Book3E support
This contains all the bits that didn't fit in previous patches :-) This
includes the actual exception handlers assembly, the changes to the
kernel entry, other misc bits and wiring it all up in Kconfig.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 61187bec7506..9efc8bda01b4 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
@@ -57,15 +57,35 @@ config E200 | |||
57 | 57 | ||
58 | endchoice | 58 | endchoice |
59 | 59 | ||
60 | config PPC_BOOK3S_64 | 60 | choice |
61 | def_bool y | 61 | prompt "Processor Type" |
62 | depends on PPC64 | 62 | depends on PPC64 |
63 | help | ||
64 | There are two families of 64 bit PowerPC chips supported. | ||
65 | The most common ones are the desktop and server CPUs | ||
66 | (POWER3, RS64, POWER4, POWER5, POWER5+, POWER6, ...) | ||
67 | |||
68 | The other are the "embedded" processors compliant with the | ||
69 | "Book 3E" variant of the architecture | ||
70 | |||
71 | config PPC_BOOK3S_64 | ||
72 | bool "Server processors" | ||
63 | select PPC_FPU | 73 | select PPC_FPU |
64 | 74 | ||
75 | config PPC_BOOK3E_64 | ||
76 | bool "Embedded processors" | ||
77 | select PPC_FPU # Make it a choice ? | ||
78 | |||
79 | endchoice | ||
80 | |||
65 | config PPC_BOOK3S | 81 | config PPC_BOOK3S |
66 | def_bool y | 82 | def_bool y |
67 | depends on PPC_BOOK3S_32 || PPC_BOOK3S_64 | 83 | depends on PPC_BOOK3S_32 || PPC_BOOK3S_64 |
68 | 84 | ||
85 | config PPC_BOOK3E | ||
86 | def_bool y | ||
87 | depends on PPC_BOOK3E_64 | ||
88 | |||
69 | config POWER4_ONLY | 89 | config POWER4_ONLY |
70 | bool "Optimize for POWER4" | 90 | bool "Optimize for POWER4" |
71 | depends on PPC64 && PPC_BOOK3S | 91 | depends on PPC64 && PPC_BOOK3S |
@@ -125,7 +145,7 @@ config 4xx | |||
125 | 145 | ||
126 | config BOOKE | 146 | config BOOKE |
127 | bool | 147 | bool |
128 | depends on E200 || E500 || 44x | 148 | depends on E200 || E500 || 44x || PPC_BOOK3E |
129 | default y | 149 | default y |
130 | 150 | ||
131 | config FSL_BOOKE | 151 | config FSL_BOOKE |
@@ -223,9 +243,17 @@ config PPC_MMU_NOHASH | |||
223 | def_bool y | 243 | def_bool y |
224 | depends on !PPC_STD_MMU | 244 | depends on !PPC_STD_MMU |
225 | 245 | ||
246 | config PPC_MMU_NOHASH_32 | ||
247 | def_bool y | ||
248 | depends on PPC_MMU_NOHASH && PPC32 | ||
249 | |||
250 | config PPC_MMU_NOHASH_64 | ||
251 | def_bool y | ||
252 | depends on PPC_MMU_NOHASH && PPC64 | ||
253 | |||
226 | config PPC_BOOK3E_MMU | 254 | config PPC_BOOK3E_MMU |
227 | def_bool y | 255 | def_bool y |
228 | depends on FSL_BOOKE | 256 | depends on FSL_BOOKE || PPC_BOOK3E |
229 | 257 | ||
230 | config PPC_MM_SLICES | 258 | config PPC_MM_SLICES |
231 | bool | 259 | bool |
@@ -257,7 +285,7 @@ config PPC_PERF_CTRS | |||
257 | This enables the powerpc-specific perf_counter back-end. | 285 | This enables the powerpc-specific perf_counter back-end. |
258 | 286 | ||
259 | config SMP | 287 | config SMP |
260 | depends on PPC_STD_MMU || FSL_BOOKE | 288 | depends on PPC_BOOK3S || PPC_BOOK3E || FSL_BOOKE |
261 | bool "Symmetric multi-processing support" | 289 | bool "Symmetric multi-processing support" |
262 | ---help--- | 290 | ---help--- |
263 | This enables support for systems with more than one CPU. If you have | 291 | This enables support for systems with more than one CPU. If you have |