powerpc: Merge remaining RTAS code
This moves rtas-proc.c and rtas_flash.c into arch/powerpc/kernel, since
cell wants them as well as pseries (and chrp can use rtas-proc.c too,
at least in principle). rtas_fw.c is gone, with its bits moved into
rtas_flash.c and rtas.c.
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 1c44a1d..3cf03ab 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -278,7 +278,6 @@
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
- select RTAS_FW
default y
config PPC_CHRP
@@ -324,7 +323,6 @@
bool " Cell Broadband Processor Architecture"
depends on PPC_MULTIPLATFORM && PPC64
select PPC_RTAS
- select RTAS_FW
select MMIO_NVRAM
config PPC_OF
@@ -356,10 +354,14 @@
depends on PPC_RTAS
default n
-config RTAS_FW
- bool
+config RTAS_PROC
+ bool "Proc interface to RTAS"
depends on PPC_RTAS
- default n
+ default y
+
+config RTAS_FLASH
+ tristate "Firmware flash interface"
+ depends on PPC64 && RTAS_PROC
config MMIO_NVRAM
bool