Fixed PCI memory definitions
PATCH 8/11 Fixed PCI memory definitions
* Fixed PCI memory definitions
Patch by Andy Fleming 17-Mar-2006
Signed-off-by Andy Fleming <[email protected]>
Signed-off-by Matthew McClintock <[email protected]>
--- board/mpc8540ads/mpc8540ads.c | 21 ++++----------------- include/configs/MPC8540ADS.h | 9 +++++---- 2 files changed, 9 insertions(+), 21 deletions(-)
board/mpc8540ads/mpc8540ads.c +4 -17
@@ -317,24 +317,8 @@ #if defined(CONFIG_PCI)* Initialize PCI Devices, report devices found. */ -#ifndef CONFIG_PCI_PNP -static struct pci_config_table pci_mpc85xxads_config_table[] = { - {PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID , -PCI_IDSEL_NUMBER ,PCI_ANY_ID , - pci_cfgfunc_config_device, {PCI_ENET0_IOADDR , -PCI_ENET0_MEMADDR , -PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER - } }, - { } -}; -#endif - -static struct pci_controller hose = { -#ifndef CONFIG_PCI_PNP - config_table: pci_mpc85xxads_config_table, -#endif -}; +static struct pci_controller hose;#endif /* CONFIG_PCI */
@@ -357,6 +341,9 @@ ft_board_setup(void *blob, bd_t *bd)u32 *p;int len; +#ifdef CONFIG_PCI +ft_pci_setup (blob, bd); +#endif ft_cpu_setup (blob, bd); p =ft_get_prop (blob,"/memory/reg" , &len);
include/configs/MPC8540ADS.h +5 -4
@@ -71,7 +71,7 @@ #define CONFIG_MEM_INIT_VALUE 0xDeadBee*/ #ifndef CONFIG_SYS_CLK_FREQ -#define CONFIG_SYS_CLK_FREQ 33000000 +#define CONFIG_SYS_CLK_FREQ 66000000#endif
@@ -327,9 +327,10 @@ #define CFG_RIO_MEM_SIZE 0x20000000 /* 1#define CFG_PCI1_MEM_BASE 0x80000000#define CFG_PCI1_MEM_PHYS CFG_PCI1_MEM_BASE#define CFG_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CFG_PCI1_IO_BASE 0xe2000000 -#define CFG_PCI1_IO_PHYS CFG_PCI1_IO_BASE -#define CFG_PCI1_IO_SIZE 0x1000000/* 16M */ + +#define CFG_PCI1_IO_BASE 0x0 +#define CFG_PCI1_IO_PHYS 0xe2000000 +#define CFG_PCI1_IO_SIZE 0x100000/* 1M */ #if defined(CONFIG_PCI )
Signature · 1 line
2006_06_07.01.gittree_pull-dirty