korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Arnd Bergmann 2005-10-31 20:08:39 -05:00 committed by Paul Mackerras
parent 19fe04755a
commit e9add2eeb1
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/Kconfig
View File

@ -278,6 +278,7 @@ config PPC_PSERIES
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
select RTAS_FW
default y
config PPC_CHRP
@ -323,6 +324,7 @@ config PPC_CELL
bool " Cell Broadband Processor Architecture"
depends on PPC_MULTIPLATFORM && PPC64
select PPC_RTAS
select RTAS_FW
config PPC_OF
bool
@ -353,6 +355,11 @@ config RTAS_ERROR_LOGGING
depends on PPC_RTAS
default n
config RTAS_FW
bool
depends on PPC_RTAS
default n
config MPIC_BROKEN_U3
bool
depends on PPC_MAPLE

1
arch/powerpc/kernel/Makefile
View File

@ -18,6 +18,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_POWER4) += idle_power4.o
obj-$(CONFIG_PPC_OF) += of_device.o
obj-$(CONFIG_PPC_RTAS) += rtas.o
obj-$(CONFIG_RTAS_FW) += rtas_fw.o
obj-$(CONFIG_IBMVIO) += vio.o
ifeq ($(CONFIG_PPC_MERGE),y)

4
arch/powerpc/platforms/pseries/rtas-fw.c → arch/powerpc/kernel/rtas_fw.c
View File

@ -1,6 +1,6 @@
/*
*
* Procedures for firmware flash updates on pSeries systems.
* Procedures for firmware flash updates.
*
* Peter Bergner, IBM March 2001.
* Copyright (C) 2001 IBM.
@ -31,8 +31,6 @@
#include <asm/uaccess.h>
#include <asm/systemcfg.h>
#include "rtas-fw.h"
struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
#define FLASH_BLOCK_LIST_VERSION (1UL)

2
arch/powerpc/platforms/pseries/Makefile
View File

@ -1,5 +1,5 @@
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_IBMVIO) += vio.o
obj-$(CONFIG_XICS) += xics.o

3
arch/powerpc/platforms/pseries/rtas-fw.h
View File

@ -1,3 +0,0 @@
void rtas_fw_restart(char *cmd);
void rtas_fw_power_off(void);
void rtas_fw_halt(void);

3
include/asm-powerpc/rtas.h
View File

@ -171,6 +171,9 @@ struct flash_block_list_header { /* just the header of flash_block_list */
struct flash_block_list *next;
};
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;