projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
cpu
/
mpc5xxx
/
pci_mpc5200.c
diff --git
a/cpu/mpc5xxx/pci_mpc5200.c
b/cpu/mpc5xxx/pci_mpc5200.c
index 1d903459e0a746a39a9535cd3b13c830b61bf8a1..a3251abf58d80a7eb715919c4aa00ede7f0bbf5f 100644
(file)
--- a/
cpu/mpc5xxx/pci_mpc5200.c
+++ b/
cpu/mpc5xxx/pci_mpc5200.c
@@
-31,8
+31,8
@@
#include <mpc5xxx.h>
/* System RAM mapped over PCI */
#include <mpc5xxx.h>
/* System RAM mapped over PCI */
-#define CONFIG_PCI_MEMORY_BUS C
FG
_SDRAM_BASE
-#define CONFIG_PCI_MEMORY_PHYS C
FG
_SDRAM_BASE
+#define CONFIG_PCI_MEMORY_BUS C
ONFIG_SYS
_SDRAM_BASE
+#define CONFIG_PCI_MEMORY_PHYS C
ONFIG_SYS
_SDRAM_BASE
#define CONFIG_PCI_MEMORY_SIZE (1024 * 1024 * 1024)
/* PCIIWCR bit fields */
#define CONFIG_PCI_MEMORY_SIZE (1024 * 1024 * 1024)
/* PCIIWCR bit fields */
@@
-125,20
+125,16
@@
void pci_mpc5xxx_init (struct pci_controller *hose)
/* Set cache line size */
*(vu_long *)MPC5XXX_PCI_CFG = (*(vu_long *)MPC5XXX_PCI_CFG & ~0xff) |
/* Set cache line size */
*(vu_long *)MPC5XXX_PCI_CFG = (*(vu_long *)MPC5XXX_PCI_CFG & ~0xff) |
- (C
FG
_CACHELINE_SIZE / 4);
+ (C
ONFIG_SYS
_CACHELINE_SIZE / 4);
/* Map MBAR to PCI space */
/* Map MBAR to PCI space */
- *(vu_long *)MPC5XXX_PCI_BAR0 = C
FG
_MBAR;
- *(vu_long *)MPC5XXX_PCI_TBATR0 = C
FG
_MBAR | 1;
+ *(vu_long *)MPC5XXX_PCI_BAR0 = C
ONFIG_SYS
_MBAR;
+ *(vu_long *)MPC5XXX_PCI_TBATR0 = C
ONFIG_SYS
_MBAR | 1;
/* Map RAM to PCI space */
*(vu_long *)MPC5XXX_PCI_BAR1 = CONFIG_PCI_MEMORY_BUS | (1 << 3);
*(vu_long *)MPC5XXX_PCI_TBATR1 = CONFIG_PCI_MEMORY_PHYS | 1;
/* Map RAM to PCI space */
*(vu_long *)MPC5XXX_PCI_BAR1 = CONFIG_PCI_MEMORY_BUS | (1 << 3);
*(vu_long *)MPC5XXX_PCI_TBATR1 = CONFIG_PCI_MEMORY_PHYS | 1;
- /* Enable snooping for RAM */
- *(vu_long *)(MPC5XXX_XLBARB + 0x40) |= (1 << 15);
- *(vu_long *)(MPC5XXX_XLBARB + 0x70) = CONFIG_PCI_MEMORY_PHYS | 0x1d;
-
/* Park XLB on PCI */
*(vu_long *)(MPC5XXX_XLBARB + 0x40) &= ~((7 << 8) | (3 << 5));
*(vu_long *)(MPC5XXX_XLBARB + 0x40) |= (3 << 8) | (3 << 5);
/* Park XLB on PCI */
*(vu_long *)(MPC5XXX_XLBARB + 0x40) &= ~((7 << 8) | (3 << 5));
*(vu_long *)(MPC5XXX_XLBARB + 0x40) |= (3 << 8) | (3 << 5);