diff options
author | Wolfgang Denk <wd@denx.de> | 2009-02-07 23:51:52 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-02-07 23:51:52 +0100 |
commit | f8306cb94f59ae2ace5bfede189944d329e5abb3 (patch) | |
tree | c26c402b9d1c3d28f5a54ffd4fcd2f3a393772de /cpu/mpc83xx | |
parent | 657f2062d8e17ebf4a55f52c9e71c07c0c94c779 (diff) | |
parent | 2d43e873a29ca4959ba6a30fc7fb396d3fd0dccf (diff) | |
download | u-boot-imx-f8306cb94f59ae2ace5bfede189944d329e5abb3.zip u-boot-imx-f8306cb94f59ae2ace5bfede189944d329e5abb3.tar.gz u-boot-imx-f8306cb94f59ae2ace5bfede189944d329e5abb3.tar.bz2 |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'cpu/mpc83xx')
-rw-r--r-- | cpu/mpc83xx/pci.c | 2 | ||||
-rw-r--r-- | cpu/mpc83xx/pcie.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpu/mpc83xx/pci.c b/cpu/mpc83xx/pci.c index e9965d7..5fe8964 100644 --- a/cpu/mpc83xx/pci.c +++ b/cpu/mpc83xx/pci.c @@ -89,7 +89,7 @@ static void pci_init_bus(int bus, struct pci_region *reg) hose->regions[i].bus_start = 0; hose->regions[i].phys_start = 0; hose->regions[i].size = gd->ram_size; - hose->regions[i].flags = PCI_REGION_MEM | PCI_REGION_MEMORY; + hose->regions[i].flags = PCI_REGION_MEM | PCI_REGION_SYS_MEMORY; hose->first_busno = 0; hose->last_busno = 0xff; diff --git a/cpu/mpc83xx/pcie.c b/cpu/mpc83xx/pcie.c index 02150ba..12b5f69 100644 --- a/cpu/mpc83xx/pcie.c +++ b/cpu/mpc83xx/pcie.c @@ -109,13 +109,13 @@ static void mpc83xx_pcie_register_hose(int bus, struct pci_region *reg, hose->regions[i].bus_start = 0; hose->regions[i].phys_start = 0; hose->regions[i].size = gd->ram_size; - hose->regions[i].flags = PCI_REGION_MEM | PCI_REGION_MEMORY; + hose->regions[i].flags = PCI_REGION_MEM | PCI_REGION_SYS_MEMORY; i = hose->region_count++; hose->regions[i].bus_start = CONFIG_SYS_IMMR; hose->regions[i].phys_start = CONFIG_SYS_IMMR; hose->regions[i].size = 0x100000; - hose->regions[i].flags = PCI_REGION_MEM | PCI_REGION_MEMORY; + hose->regions[i].flags = PCI_REGION_MEM | PCI_REGION_SYS_MEMORY; hose->first_busno = max_bus; hose->last_busno = 0xff; |