[PATCH] ppc: Fix io.h for config with CONFIG_PCI not set
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:
Родитель
b61c5509fe
Коммит
19a79859e1
|
@ -31,14 +31,6 @@
|
|||
#include <platforms/85xx/mpc85xx_cds.h>
|
||||
#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 */
|
||||
extern phys_addr_t get_ccsrbar(void);
|
||||
|
||||
|
|
|
@ -26,17 +26,11 @@
|
|||
|
||||
#if defined(CONFIG_4xx)
|
||||
#include <asm/ibm4xx.h>
|
||||
#elif defined(CONFIG_PPC_MPC52xx)
|
||||
#include <asm/mpc52xx.h>
|
||||
#elif defined(CONFIG_8xx)
|
||||
#include <asm/mpc8xx.h>
|
||||
#elif defined(CONFIG_8260)
|
||||
#include <asm/mpc8260.h>
|
||||
#elif defined(CONFIG_83xx)
|
||||
#include <asm/mpc83xx.h>
|
||||
#elif defined(CONFIG_85xx)
|
||||
#include <asm/mpc85xx.h>
|
||||
#elif defined(CONFIG_APUS)
|
||||
#elif defined(CONFIG_APUS) || !defined(CONFIG_PCI)
|
||||
#define _IO_BASE 0
|
||||
#define _ISA_MEM_BASE 0
|
||||
#define PCI_DRAM_OFFSET 0
|
||||
|
|
|
@ -29,17 +29,6 @@ struct pt_regs;
|
|||
#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 */
|
||||
/* ======================================================================== */
|
||||
|
|
|
@ -25,14 +25,6 @@
|
|||
#include <platforms/83xx/mpc834x_sys.h>
|
||||
#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
|
||||
* into the kernel.
|
||||
|
|
|
@ -44,14 +44,6 @@
|
|||
#include <platforms/85xx/tqm85xx.h>
|
||||
#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
|
||||
* into the kernel.
|
||||
|
|
Загрузка…
Ссылка в новой задаче