diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-26 03:05:24 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 03:05:24 -0400 |
commit | 033ef338b6e007dc081c6282a4f2a9dd761f8cd2 (patch) | |
tree | 3c77fad71c3d9ba04ddcdaea33063aaf7520ddb0 /arch/powerpc/Kconfig | |
parent | f9bd170a87948a9e077149b70fb192c563770fdf (diff) |
powerpc: Merge rtas.c into arch/powerpc/kernel
This splits arch/ppc64/kernel/rtas.c into arch/powerpc/kernel/rtas.c,
which contains generic RTAS functions useful on any CHRP platform,
and arch/powerpc/platforms/pseries/rtas-fw.[ch], which contain
some pSeries-specific firmware flashing bits. The parts of rtas.c
that are to do with pSeries-specific error logging are protected
by a new CONFIG_RTAS_ERROR_LOGGING symbol. The inclusion of rtas.o
is controlled by the CONFIG_PPC_RTAS symbol, and the relevant
platforms select that.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 9f279e0d84f2..ce5100cadd34 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -276,6 +276,8 @@ config PPC_PSERIES | |||
276 | depends on PPC_MULTIPLATFORM && PPC64 | 276 | depends on PPC_MULTIPLATFORM && PPC64 |
277 | bool " IBM pSeries & new (POWER5-based) iSeries" | 277 | bool " IBM pSeries & new (POWER5-based) iSeries" |
278 | select PPC_I8259 | 278 | select PPC_I8259 |
279 | select PPC_RTAS | ||
280 | select RTAS_ERROR_LOGGING | ||
279 | default y | 281 | default y |
280 | 282 | ||
281 | config PPC_CHRP | 283 | config PPC_CHRP |
@@ -283,6 +285,7 @@ config PPC_CHRP | |||
283 | depends on PPC_MULTIPLATFORM && PPC32 | 285 | depends on PPC_MULTIPLATFORM && PPC32 |
284 | select PPC_I8259 | 286 | select PPC_I8259 |
285 | select PPC_INDIRECT_PCI | 287 | select PPC_INDIRECT_PCI |
288 | select PPC_RTAS | ||
286 | default y | 289 | default y |
287 | 290 | ||
288 | config PPC_PMAC | 291 | config PPC_PMAC |
@@ -317,6 +320,7 @@ config PPC_MAPLE | |||
317 | config PPC_BPA | 320 | config PPC_BPA |
318 | bool " Broadband Processor Architecture" | 321 | bool " Broadband Processor Architecture" |
319 | depends on PPC_MULTIPLATFORM && PPC64 | 322 | depends on PPC_MULTIPLATFORM && PPC64 |
323 | select PPC_RTAS | ||
320 | 324 | ||
321 | config PPC_OF | 325 | config PPC_OF |
322 | bool | 326 | bool |
@@ -338,6 +342,15 @@ config MPIC | |||
338 | bool | 342 | bool |
339 | default y | 343 | default y |
340 | 344 | ||
345 | config PPC_RTAS | ||
346 | bool | ||
347 | default n | ||
348 | |||
349 | config RTAS_ERROR_LOGGING | ||
350 | bool | ||
351 | depends on PPC_RTAS | ||
352 | default n | ||
353 | |||
341 | config MPIC_BROKEN_U3 | 354 | config MPIC_BROKEN_U3 |
342 | bool | 355 | bool |
343 | depends on PPC_MAPLE | 356 | depends on PPC_MAPLE |