Commit e9add2ee authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras

[PATCH] powerpc: move rtas_fw.c out of platforms/pseries

Cell uses the same code as pSeries for flashing the firmware
through rtas, so the implementation should not be part of
platforms/pseries.

Put it into arch/powerpc/kernel instead.
Signed-off-by: default avatarArnd Bergmann <arndb@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 19fe0475
...@@ -278,6 +278,7 @@ config PPC_PSERIES ...@@ -278,6 +278,7 @@ config PPC_PSERIES
select PPC_I8259 select PPC_I8259
select PPC_RTAS select PPC_RTAS
select RTAS_ERROR_LOGGING select RTAS_ERROR_LOGGING
select RTAS_FW
default y default y
config PPC_CHRP config PPC_CHRP
...@@ -323,6 +324,7 @@ config PPC_CELL ...@@ -323,6 +324,7 @@ config PPC_CELL
bool " Cell Broadband Processor Architecture" bool " Cell Broadband Processor Architecture"
depends on PPC_MULTIPLATFORM && PPC64 depends on PPC_MULTIPLATFORM && PPC64
select PPC_RTAS select PPC_RTAS
select RTAS_FW
config PPC_OF config PPC_OF
bool bool
...@@ -353,6 +355,11 @@ config RTAS_ERROR_LOGGING ...@@ -353,6 +355,11 @@ config RTAS_ERROR_LOGGING
depends on PPC_RTAS depends on PPC_RTAS
default n default n
config RTAS_FW
bool
depends on PPC_RTAS
default n
config MPIC_BROKEN_U3 config MPIC_BROKEN_U3
bool bool
depends on PPC_MAPLE depends on PPC_MAPLE
......
...@@ -18,6 +18,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o ...@@ -18,6 +18,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_POWER4) += idle_power4.o obj-$(CONFIG_POWER4) += idle_power4.o
obj-$(CONFIG_PPC_OF) += of_device.o obj-$(CONFIG_PPC_OF) += of_device.o
obj-$(CONFIG_PPC_RTAS) += rtas.o obj-$(CONFIG_PPC_RTAS) += rtas.o
obj-$(CONFIG_RTAS_FW) += rtas_fw.o
obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMVIO) += vio.o
ifeq ($(CONFIG_PPC_MERGE),y) ifeq ($(CONFIG_PPC_MERGE),y)
......
/* /*
* *
* Procedures for firmware flash updates on pSeries systems. * Procedures for firmware flash updates.
* *
* Peter Bergner, IBM March 2001. * Peter Bergner, IBM March 2001.
* Copyright (C) 2001 IBM. * Copyright (C) 2001 IBM.
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include "rtas-fw.h"
struct flash_block_list_header rtas_firmware_flash_list = {0, NULL}; struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
#define FLASH_BLOCK_LIST_VERSION (1UL) #define FLASH_BLOCK_LIST_VERSION (1UL)
......
obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \
setup.o iommu.o rtas-fw.o ras.o setup.o iommu.o ras.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMVIO) += vio.o
obj-$(CONFIG_XICS) += xics.o obj-$(CONFIG_XICS) += xics.o
void rtas_fw_restart(char *cmd);
void rtas_fw_power_off(void);
void rtas_fw_halt(void);
...@@ -171,6 +171,9 @@ struct flash_block_list_header { /* just the header of flash_block_list */ ...@@ -171,6 +171,9 @@ struct flash_block_list_header { /* just the header of flash_block_list */
struct flash_block_list *next; struct flash_block_list *next;
}; };
extern struct flash_block_list_header rtas_firmware_flash_list; extern struct flash_block_list_header rtas_firmware_flash_list;
void rtas_fw_restart(char *cmd);
void rtas_fw_power_off(void);
void rtas_fw_halt(void);
extern struct rtas_t rtas; extern struct rtas_t rtas;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment