mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
[POWERPC] Move RapidIO support code from arch/ppc
Do just enough to move the RapidIO support code for 85xx over from arch/ppc into arch/powerpc and make it still build. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
5febf1cd79
commit
de3c8d4182
10 changed files with 5 additions and 6 deletions
|
@ -70,6 +70,7 @@ pci64-$(CONFIG_PPC64) += pci_dn.o isa-bridge.o
|
|||
obj-$(CONFIG_PCI) += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
|
||||
pci-common.o
|
||||
obj-$(CONFIG_PCI_MSI) += msi.o
|
||||
obj-$(CONFIG_RAPIDIO) += rio.o
|
||||
obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o \
|
||||
machine_kexec_$(CONFIG_WORD_SIZE).o
|
||||
obj-$(CONFIG_AUDIT) += audit.o
|
||||
|
|
|
@ -12,6 +12,7 @@ obj-$(CONFIG_U3_DART) += dart_iommu.o
|
|||
obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o
|
||||
obj-$(CONFIG_FSL_SOC) += fsl_soc.o
|
||||
obj-$(CONFIG_FSL_PCI) += fsl_pci.o
|
||||
obj-$(CONFIG_RAPIDIO) += fsl_rio.o
|
||||
obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o
|
||||
obj-$(CONFIG_QUICC_ENGINE) += qe_lib/
|
||||
obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
|
||||
|
|
|
@ -13,7 +13,6 @@ obj-y := entry.o traps.o time.o misc.o \
|
|||
ppc_htab.o
|
||||
obj-$(CONFIG_MODULES) += ppc_ksyms.o
|
||||
obj-$(CONFIG_PCI) += pci.o
|
||||
obj-$(CONFIG_RAPIDIO) += rio.o
|
||||
obj-$(CONFIG_KGDB) += ppc-stub.o
|
||||
obj-$(CONFIG_SMP) += smp.o smp-tbsync.o
|
||||
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
|
||||
|
|
|
@ -42,8 +42,6 @@
|
|||
|
||||
#include <mm/mmu_decl.h>
|
||||
|
||||
#include <syslib/ppc85xx_rio.h>
|
||||
|
||||
#include <platforms/85xx/mpc85xx_ads_common.h>
|
||||
|
||||
#ifndef CONFIG_PCI
|
||||
|
@ -190,6 +188,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn)
|
|||
#endif /* CONFIG_PCI */
|
||||
|
||||
#ifdef CONFIG_RAPIDIO
|
||||
extern void mpc85xx_rio_setup(int law_start, int law_size);
|
||||
void platform_rio_init(void)
|
||||
{
|
||||
/* 512MB RIO LAW at 0xc0000000 */
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
|
||||
#include <syslib/cpm2_pic.h>
|
||||
#include <syslib/ppc85xx_common.h>
|
||||
#include <syslib/ppc85xx_rio.h>
|
||||
|
||||
|
||||
unsigned char __res[sizeof(bd_t)];
|
||||
|
@ -270,6 +269,7 @@ int mpc85xx_exclude_device(u_char bus, u_char devfn)
|
|||
#endif /* CONFIG_PCI */
|
||||
|
||||
#ifdef CONFIG_RAPIDIO
|
||||
extern void mpc85xx_rio_setup(int law_start, int law_size);
|
||||
void
|
||||
platform_rio_init(void)
|
||||
{
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
#include <syslib/ppc85xx_setup.h>
|
||||
#include <syslib/cpm2_pic.h>
|
||||
#include <syslib/ppc85xx_common.h>
|
||||
#include <syslib/ppc85xx_rio.h>
|
||||
|
||||
#ifndef CONFIG_PCI
|
||||
unsigned long isa_io_base = 0;
|
||||
|
@ -309,6 +308,7 @@ int mpc85xx_exclude_device(u_char bus, u_char devfn)
|
|||
#endif /* CONFIG_PCI */
|
||||
|
||||
#ifdef CONFIG_RAPIDIO
|
||||
extern void mpc85xx_rio_setup(int law_start, int law_size);
|
||||
void platform_rio_init(void)
|
||||
{
|
||||
/* 512MB RIO LAW at 0xc0000000 */
|
||||
|
|
|
@ -93,7 +93,6 @@ obj-$(CONFIG_85xx) += open_pic.o ppc85xx_common.o ppc85xx_setup.o \
|
|||
ifeq ($(CONFIG_85xx),y)
|
||||
obj-$(CONFIG_PCI) += pci_auto.o
|
||||
endif
|
||||
obj-$(CONFIG_RAPIDIO) += ppc85xx_rio.o
|
||||
obj-$(CONFIG_83xx) += ppc83xx_setup.o ppc_sys.o \
|
||||
mpc83xx_sys.o mpc83xx_devices.o ipic.o
|
||||
ifeq ($(CONFIG_83xx),y)
|
||||
|
|
Loading…
Reference in a new issue