diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-02-22 14:15:41 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-02-22 14:15:41 -0600 |
| commit | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (patch) | |
| tree | 5eefe0c7b244ffd0798e64f9a83ec7084032a816 /cpu/ppc4xx/405gp_pci.c | |
| parent | 230b31febf39f9d9f19679cf0112d9e30415122d (diff) | |
| parent | 6624b687bc2b747233090e67628df37d1c84ed17 (diff) | |
| download | u-boot-imx-79582020313e6d992a3bac71cf3a9b337f9ac7f7.zip u-boot-imx-79582020313e6d992a3bac71cf3a9b337f9ac7f7.tar.gz u-boot-imx-79582020313e6d992a3bac71cf3a9b337f9ac7f7.tar.bz2 | |
Merge rsync://rsync.denx.de/git/u-boot
Diffstat (limited to 'cpu/ppc4xx/405gp_pci.c')
| -rw-r--r-- | cpu/ppc4xx/405gp_pci.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c index 64431ab..f6b29e9 100644 --- a/cpu/ppc4xx/405gp_pci.c +++ b/cpu/ppc4xx/405gp_pci.c @@ -81,6 +81,10 @@ #ifdef CONFIG_PCI +#if defined(CONFIG_PMC405) +ushort pmc405_pci_subsys_deviceid(void); +#endif + /*#define DEBUG*/ /*-----------------------------------------------------------------------------+ @@ -96,13 +100,10 @@ void pci_405gp_init(struct pci_controller *hose) unsigned short temp_short; unsigned long ptmpcila[2] = {CFG_PCI_PTM1PCI, CFG_PCI_PTM2PCI}; #if defined(CONFIG_CPCI405) || defined(CONFIG_PMC405) - unsigned long ptmla[2] = {bd->bi_memstart, bd->bi_flashstart}; - unsigned long ptmms[2] = {~(bd->bi_memsize - 1) | 1, ~(bd->bi_flashsize - 1) | 1}; char *ptmla_str, *ptmms_str; -#else +#endif unsigned long ptmla[2] = {CFG_PCI_PTM1LA, CFG_PCI_PTM2LA}; unsigned long ptmms[2] = {CFG_PCI_PTM1MS, CFG_PCI_PTM2MS}; -#endif #if defined(CONFIG_PIP405) || defined (CONFIG_MIP405) unsigned long pmmla[3] = {0x80000000, 0xA0000000, 0}; unsigned long pmmma[3] = {0xE0000001, 0xE0000001, 0}; |