leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] ppc: Fix io.h for config with CONFIG_PCI not set

Browse Source 
When CONFIG_PCI option is not set, the variables
pci_dram_offset, isa_io_base and isa_mem_base are not defined.

Currently, the test is handled in each platform header. This
patch moves the test in io.h once and for all.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Sylvain Munaut 2006-11-11 10:53:19 +01:00 committed by Paul Mackerras
parent b61c5509fe
commit 19a79859e1
5 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/asm-powerpc/mpc85xx.h
View File

@ -31,14 +31,6 @@
#include <platforms/85xx/mpc85xx_cds.h> #include <platforms/85xx/mpc85xx_cds.h>
#endif #endif
#define _IO_BASE isa_io_base
#define _ISA_MEM_BASE isa_mem_base
#ifdef CONFIG_PCI
#define PCI_DRAM_OFFSET pci_dram_offset
#else
#define PCI_DRAM_OFFSET 0
#endif
/* Let modules/drivers get at CCSRBAR */ /* Let modules/drivers get at CCSRBAR */
extern phys_addr_t get_ccsrbar(void); extern phys_addr_t get_ccsrbar(void);

8
include/asm-ppc/io.h
View File

@ -26,17 +26,11 @@
#if defined(CONFIG_4xx) #if defined(CONFIG_4xx)
#include <asm/ibm4xx.h> #include <asm/ibm4xx.h>
#elif defined(CONFIG_PPC_MPC52xx)
#include <asm/mpc52xx.h>
#elif defined(CONFIG_8xx) #elif defined(CONFIG_8xx)
#include <asm/mpc8xx.h> #include <asm/mpc8xx.h>
#elif defined(CONFIG_8260) #elif defined(CONFIG_8260)
#include <asm/mpc8260.h> #include <asm/mpc8260.h>
#elif defined(CONFIG_83xx) #elif defined(CONFIG_APUS) || !defined(CONFIG_PCI)
#include <asm/mpc83xx.h>
#elif defined(CONFIG_85xx)
#include <asm/mpc85xx.h>
#elif defined(CONFIG_APUS)
#define _IO_BASE 0 #define _IO_BASE 0
#define _ISA_MEM_BASE 0 #define _ISA_MEM_BASE 0
#define PCI_DRAM_OFFSET 0 #define PCI_DRAM_OFFSET 0

11
include/asm-ppc/mpc52xx.h
View File

@ -29,17 +29,6 @@ struct pt_regs;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#ifdef CONFIG_PCI
#define _IO_BASE isa_io_base
#define _ISA_MEM_BASE isa_mem_base
#define PCI_DRAM_OFFSET pci_dram_offset
#else
#define _IO_BASE 0
#define _ISA_MEM_BASE 0
#define PCI_DRAM_OFFSET 0
#endif
/* ======================================================================== */ /* ======================================================================== */
/* PPC Sys devices definition */ /* PPC Sys devices definition */
/* ======================================================================== */ /* ======================================================================== */

8
include/asm-ppc/mpc83xx.h
View File

@ -25,14 +25,6 @@
#include <platforms/83xx/mpc834x_sys.h> #include <platforms/83xx/mpc834x_sys.h>
#endif #endif
#define _IO_BASE isa_io_base
#define _ISA_MEM_BASE isa_mem_base
#ifdef CONFIG_PCI
#define PCI_DRAM_OFFSET pci_dram_offset
#else
#define PCI_DRAM_OFFSET 0
#endif
/* /*
* The "residual" board information structure the boot loader passes * The "residual" board information structure the boot loader passes
* into the kernel. * into the kernel.

8
include/asm-ppc/mpc85xx.h
View File

@ -44,14 +44,6 @@
#include <platforms/85xx/tqm85xx.h> #include <platforms/85xx/tqm85xx.h>
#endif #endif
#define _IO_BASE isa_io_base
#define _ISA_MEM_BASE isa_mem_base
#ifdef CONFIG_PCI
#define PCI_DRAM_OFFSET pci_dram_offset
#else
#define PCI_DRAM_OFFSET 0
#endif
/* /*
* The "residual" board information structure the boot loader passes * The "residual" board information structure the boot loader passes
* into the kernel. * into the kernel.