Merge branch 'mimc200'

[oweals/u-boot.git] / cpu / mpc8220 / pci.c

diff --git a/cpu/mpc8220/pci.c b/cpu/mpc8220/pci.c
index ca4a04d21e194e20f19b18e51f9dcd37406bc712..7ef43b72cd77112356e7d1775b6d31e315e6b7da 100644 (file)
--- a/cpu/mpc8220/pci.c
+++ b/cpu/mpc8220/pci.c
@@ -33,8 +33,8 @@
 #if defined(CONFIG_PCI)
 
 /* System RAM mapped over PCI */
-#define CONFIG_PCI_SYS_MEM_BUS  CFG_SDRAM_BASE
-#define CONFIG_PCI_SYS_MEM_PHYS         CFG_SDRAM_BASE
+#define CONFIG_PCI_SYS_MEM_BUS  CONFIG_SYS_SDRAM_BASE
+#define CONFIG_PCI_SYS_MEM_PHYS         CONFIG_SYS_SDRAM_BASE
 #define CONFIG_PCI_SYS_MEM_SIZE         (1024 * 1024 * 1024)
 
 #define cfg_read(val, addr, type, op)          *val = op((type)(addr));
@@ -165,12 +165,12 @@ pci_mpc8220_init(struct pci_controller *hose)
                CONFIG_PCI_SYS_MEM_BUS,
                CONFIG_PCI_SYS_MEM_PHYS,
                CONFIG_PCI_SYS_MEM_SIZE,
-               PCI_REGION_MEM | PCI_REGION_MEMORY);
+               PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
 
        hose->region_count = 3;
 
        hose->cfg_addr = &(xcpci->cfg_adr);
-       hose->cfg_data = CONFIG_PCI_CFG_BUS;
+       hose->cfg_data = (volatile unsigned char *)CONFIG_PCI_CFG_BUS;
 
        pci_set_ops(hose,
                mpc8220_pci_read_config_byte,